mirror of
https://github.com/apache/jclouds.git
synced 2025-02-16 15:08:28 +00:00
tidy test, add missing test, remove leftovers
This commit is contained in:
parent
fe31db7eea
commit
2433ec1d3f
@ -30,7 +30,6 @@ import org.jclouds.vcloud.director.v1_5.domain.AvailableNetworks;
|
|||||||
import org.jclouds.vcloud.director.v1_5.domain.Capabilities;
|
import org.jclouds.vcloud.director.v1_5.domain.Capabilities;
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.CapacityWithUsage;
|
import org.jclouds.vcloud.director.v1_5.domain.CapacityWithUsage;
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams;
|
import org.jclouds.vcloud.director.v1_5.domain.CaptureVAppParams;
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.CloneMediaParams;
|
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams;
|
import org.jclouds.vcloud.director.v1_5.domain.CloneVAppParams;
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams;
|
import org.jclouds.vcloud.director.v1_5.domain.CloneVAppTemplateParams;
|
||||||
import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams;
|
import org.jclouds.vcloud.director.v1_5.domain.ComposeVAppParams;
|
||||||
@ -57,14 +56,14 @@ import org.testng.annotations.Test;
|
|||||||
*
|
*
|
||||||
* @author danikov
|
* @author danikov
|
||||||
*/
|
*/
|
||||||
@Test(groups = { "unit", "apitests", "user" }, singleThreaded = true, testName = "VdcClientExpectTest")
|
@Test(groups = { "unit", "user", "vdc" }, singleThreaded = true, testName = "VdcClientExpectTest")
|
||||||
public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest {
|
public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest {
|
||||||
|
|
||||||
private Reference vdcRef;
|
private Reference vdcRef;
|
||||||
|
|
||||||
@BeforeClass
|
@BeforeClass
|
||||||
public void before() {
|
public void before() {
|
||||||
String vdcId = "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f";
|
String vdcId = "e9cd3387-ac57-4d27-a481-9bee75e0690f";
|
||||||
vdcRef = Reference.builder()
|
vdcRef = Reference.builder()
|
||||||
.type("application/vnd.vmware.vcloud.vdc+xml")
|
.type("application/vnd.vmware.vcloud.vdc+xml")
|
||||||
.name("")
|
.name("")
|
||||||
@ -73,7 +72,7 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(enabled = false)
|
@Test
|
||||||
public void testGetVdc() {
|
public void testGetVdc() {
|
||||||
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
||||||
new VcloudHttpRequestPrimer()
|
new VcloudHttpRequestPrimer()
|
||||||
@ -89,8 +88,10 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
assertEquals(client.getVdcClient().getVdc(vdcRef), expected);
|
assertEquals(client.getVdcClient().getVdc(vdcRef), expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(enabled = false)
|
@Test
|
||||||
public void testResponse400ForInvalidVdcId() {
|
public void testResponse400ForInvalidVdcId() {
|
||||||
|
URI vdcUri = URI.create(endpoint + "/vdc/NOTAUUID");
|
||||||
|
|
||||||
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
||||||
new VcloudHttpRequestPrimer()
|
new VcloudHttpRequestPrimer()
|
||||||
.apiCommand("GET", "/vdc/NOTAUUID")
|
.apiCommand("GET", "/vdc/NOTAUUID")
|
||||||
@ -105,6 +106,8 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
.majorErrorCode(400)
|
.majorErrorCode(400)
|
||||||
.minorErrorCode("BAD_REQUEST")
|
.minorErrorCode("BAD_REQUEST")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
Reference vdcRef = Reference.builder().href(vdcUri).build();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
client.getVdcClient().getVdc(vdcRef);
|
client.getVdcClient().getVdc(vdcRef);
|
||||||
@ -116,8 +119,10 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test(enabled = false)
|
@Test
|
||||||
public void testResponse403ForFakeVdcId() {
|
public void testResponse403ForFakeVdcId() {
|
||||||
|
URI vdcUri = URI.create(endpoint + "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee");
|
||||||
|
|
||||||
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
||||||
new VcloudHttpRequestPrimer()
|
new VcloudHttpRequestPrimer()
|
||||||
.apiCommand("GET", "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
|
.apiCommand("GET", "/vdc/aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee")
|
||||||
@ -132,6 +137,8 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
.majorErrorCode(403)
|
.majorErrorCode(403)
|
||||||
.minorErrorCode("ACCESS_TO_RESOURCE_IS_FORBIDDEN")
|
.minorErrorCode("ACCESS_TO_RESOURCE_IS_FORBIDDEN")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
|
Reference vdcRef = Reference.builder().href(vdcUri).build();
|
||||||
|
|
||||||
try {
|
try {
|
||||||
client.getVdcClient().getVdc(vdcRef);
|
client.getVdcClient().getVdc(vdcRef);
|
||||||
@ -193,6 +200,28 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test(enabled = false)
|
||||||
|
public void testCloneVApp() {
|
||||||
|
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
||||||
|
new VcloudHttpRequestPrimer()
|
||||||
|
.apiCommand("POST", "/vdc/e9cd3387-ac57-4d27-a481-9bee75e0690f/action/cloneVAppTemplate")
|
||||||
|
.xmlFilePayload("/vdc/params/cloneVApp.xml", VCloudDirectorMediaType.CLONE_V_APP_PARAMS)
|
||||||
|
.acceptAnyMedia()
|
||||||
|
.httpRequestBuilder().build(),
|
||||||
|
new VcloudHttpResponsePrimer()
|
||||||
|
.xmlFilePayload("/vdc/cloneVApp.xml", VCloudDirectorMediaType.V_APP)
|
||||||
|
.httpResponseBuilder().build());
|
||||||
|
|
||||||
|
VApp expected = cloneVApp();
|
||||||
|
|
||||||
|
// TODO: configure params
|
||||||
|
CloneVAppParams params = CloneVAppParams.builder()
|
||||||
|
|
||||||
|
.build();
|
||||||
|
|
||||||
|
assertEquals(client.getVdcClient().cloneVApp(vdcRef, params), expected);
|
||||||
|
}
|
||||||
|
|
||||||
@Test(enabled = false)
|
@Test(enabled = false)
|
||||||
public void testCloneVAppTemplate() {
|
public void testCloneVAppTemplate() {
|
||||||
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
VCloudDirectorClient client = requestsSendResponses(loginRequest, sessionResponse,
|
||||||
@ -478,11 +507,6 @@ public class VdcClientExpectTest extends BaseVCloudDirectorRestClientExpectTest
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Media cloneMedia() {
|
|
||||||
// TODO Auto-generated method stub
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private VApp cloneVApp() {
|
private VApp cloneVApp() {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return null;
|
return null;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user