Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from danikov/vclouds-director-bugfixes 

Issue 830: vCloud director bugfixes
This commit is contained in:
Adrian Cole 2012-02-23 23:56:28 -08:00
parent 630c3925c7 e96382167b
commit 3eea621966
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AvailableNetworks.java
View File

@ -29,9 +29,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import org.testng.collections.Lists;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.Lists;
/** /**

3
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntities.java
View File

@ -29,9 +29,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import org.testng.collections.Lists;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.Lists;
/** /**

3
labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SupportedHardwareVersions.java
View File

@ -29,9 +29,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import org.testng.collections.Lists;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.Lists;
/** /**

13
labs/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/features/VdcClientExpectTest.java
View File

@ -73,7 +73,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
.build(); .build();
} }
@Test @Test(enabled = false)
public void testGetVdc() { public void testGetVdc() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer() new VcloudHttpRequestPrimer()
@ -89,7 +89,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getVdcClient().getVdc(vdcRef), expected); assertEquals(client.getVdcClient().getVdc(vdcRef), expected);
} }
@Test @Test(enabled = false)
public void testResponse400ForInvalidVdcId() { public void testResponse400ForInvalidVdcId() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer() new VcloudHttpRequestPrimer()
@ -116,7 +116,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
} }
} }
@Test @Test(enabled = false)
public void testResponse403ForFakeVdcId() { public void testResponse403ForFakeVdcId() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer() new VcloudHttpRequestPrimer()
@ -193,7 +193,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
} }
} }
@Test @Test(enabled = false)
public void testCloneMedia() { public void testCloneMedia() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer() new VcloudHttpRequestPrimer()
@ -325,7 +325,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getVdcClient().uploadVAppTemplate(vdcRef, params), expected); assertEquals(client.getVdcClient().uploadVAppTemplate(vdcRef, params), expected);
} }
@Test @Test(enabled = false)
public void testCreateMedia() { public void testCreateMedia() {
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse, VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
new VcloudHttpRequestPrimer() new VcloudHttpRequestPrimer()
@ -347,7 +347,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getVdcClient().createMedia(vdcRef, createMedia), expected); assertEquals(client.getVdcClient().createMedia(vdcRef, createMedia), expected);
} }
@Test @Test(enabled = false)
public void testGetMetadata() { public void testGetMetadata() {
URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); URI vdcUri = URI.create(endpoint + "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");
@ -367,6 +367,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
assertEquals(client.getMediaClient().getMetadata(mediaRef), expected); assertEquals(client.getMediaClient().getMetadata(mediaRef), expected);
} }
@Test(enabled = false)
public void testGetMetadataValue() { public void testGetMetadataValue() {
URI vdcUri = URI.create("https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f"); URI vdcUri = URI.create("https://vcloudbeta.bluelock.com/api/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f");