From 5f8b031c956fef709dac2e9e4be35738964240a1 Mon Sep 17 00:00:00 2001 From: danikov Date: Thu, 16 Feb 2012 17:31:59 +0000 Subject: [PATCH] add missing acceptable link rels & media types --- .../vcloud/director/v1_5/VCloudDirectorMediaType.java | 6 +++++- .../java/org/jclouds/vcloud/director/v1_5/domain/Link.java | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java index 29bd986cbd..eae847ebd3 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/VCloudDirectorMediaType.java @@ -68,11 +68,15 @@ public class VCloudDirectorMediaType { public static final String MEDIA = "application/vnd.vmware.vcloud.media+xml"; public static final String OWNER = "application/vnd.vmware.vcloud.owner+xml"; + + public static final String VDC = "application/vnd.vmware.vcloud.vdc+xml"; + + public static final String ADMIN_USER = "application/vnd.vmware.admin.user+xml"; public static final List ALL = Arrays.asList( SESSION, ERROR, ORG_LIST, METADATA, METADATA_ENTRY, METADATA_VALUE, ORG, TASKS_LIST, TASK, ORG_NETWORK, CATALOG, CATALOG_ITEM, CATALOG_ITEMS, CATALOGS_LIST, PROPERTY, - MEDIA, OWNER + MEDIA, OWNER, VDC, ADMIN_USER ); } diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java index 7779d9a929..c56c8ed202 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java @@ -47,10 +47,13 @@ public class Link extends ReferenceType { public static final String DOWN = "down"; public static final String EDIT = "edit"; public static final String DELETE = "delete"; + public static final String ADD = "add"; + public static final String REMOVE = "remove"; + public static final String CATALOG_ITEM = "catalogItem"; public static final String TASK_CANCEL = "task:cancel"; public static final List ALL = Arrays.asList( - UP, DOWN, EDIT, DELETE, TASK_CANCEL + UP, DOWN, EDIT, DELETE, ADD, REMOVE, CATALOG_ITEM, TASK_CANCEL ); }