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

The template entries in a catalog may have different names to the acutal VAppTemplates, so check the URIs

This commit is contained in:
Andrew Donald Kennedy 2011-12-20 17:36:09 +00:00
parent 1b10e19e0b
commit e4c8789917
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apis/vcloud/src/test/java/org/jclouds/vcloud/features/VAppTemplateClientLiveTest.java
View File

@ -49,7 +49,6 @@ import com.google.common.collect.ImmutableMap;
*/ */
@Test(groups = "live", enabled = true, singleThreaded = true, testName = "VAppTemplateClientLiveTest") @Test(groups = "live", enabled = true, singleThreaded = true, testName = "VAppTemplateClientLiveTest")
public class VAppTemplateClientLiveTest extends BaseVCloudClientLiveTest { public class VAppTemplateClientLiveTest extends BaseVCloudClientLiveTest {
@Test @Test
public void testGetVAppTemplate() throws Exception { public void testGetVAppTemplate() throws Exception {
Org org = getVCloudApi().getOrgClient().findOrgNamed(null); Org org = getVCloudApi().getOrgClient().findOrgNamed(null);
@ -60,8 +59,9 @@ public class VAppTemplateClientLiveTest extends BaseVCloudClientLiveTest {
CatalogItem item = getVCloudApi().getCatalogClient().getCatalogItem(resource.getHref()); CatalogItem item = getVCloudApi().getCatalogClient().getCatalogItem(resource.getHref());
if (item.getEntity().getType().equals(VCloudMediaType.VAPPTEMPLATE_XML)) { if (item.getEntity().getType().equals(VCloudMediaType.VAPPTEMPLATE_XML)) {
VAppTemplate template = getVCloudApi().getVAppTemplateClient().getVAppTemplate(item.getEntity().getHref()); VAppTemplate template = getVCloudApi().getVAppTemplateClient().getVAppTemplate(item.getEntity().getHref());
if (template != null){ if (template != null) {
assertEquals(template.getName(),item.getEntity().getName()); // the UUID in the href is the only way to actually link templates
assertEquals(template.getHref(), item.getEntity().getHref());
} else { } else {
// null can be no longer available or auth exception // null can be no longer available or auth exception
} }
@ -100,7 +100,8 @@ public class VAppTemplateClientLiveTest extends BaseVCloudClientLiveTest {
VAppTemplate template = getVCloudApi().getVAppTemplateClient().findVAppTemplateInOrgCatalogNamed( VAppTemplate template = getVCloudApi().getVAppTemplateClient().findVAppTemplateInOrgCatalogNamed(
org.getName(), response.getName(), item.getEntity().getName()); org.getName(), response.getName(), item.getEntity().getName());
if (template != null) { if (template != null) {
assertEquals(template.getName(), item.getEntity().getName()); // the UUID in the href is the only way to actually link templates
assertEquals(template.getHref(), item.getEntity().getHref());
} else { } else {
// null can be no longer available or auth exception // null can be no longer available or auth exception
} }