Merge pull request #23 from indigo-dc/devel

Add test case to check nested outputs

Author: alpegon

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>es.upv.i3m.grycap</groupId>
   <artifactId>im-java-api</artifactId>
-  <version>0.4.1</version>
+  <version>0.4.2</version>
   <name>IM Java API</name>
   <description>Java client for the REST API of the IM</description>
 

src/test/java/es/upv/i3m/grycap/im/InfrastructureManagerTest.java

@@ -62,11 +62,6 @@ public class InfrastructureManagerTest extends ImTestWatcher {
 
   private static final String VM_DEFAULT_ID = "0";
 
-  private static final String EXPECTED_INFRASTRUCTURE_OUTPUT_GALAXY_URL_KEY =
-      "galaxy_url";
-  private static final String EXPECTED_INFRASTRUCTURE_OUTPUT_GALAXY_URL_VALUE =
-      "http://10.0.0.1:8080";
-
   private String getInfrastructureId() {
     return infrastructureId;
   }
@@ -215,10 +210,21 @@ public void testInfrastructureOutputs() throws ImClientException {
     String infId = getInfrastructureId();
     InfOutputValues result = getIm().getInfrastructureOutputs(infId);
     Map<String, Object> outputs = result.getOutputs();
-    String galaxyUrl =
-        (String) outputs.get(EXPECTED_INFRASTRUCTURE_OUTPUT_GALAXY_URL_KEY);
-    Assert.assertEquals(EXPECTED_INFRASTRUCTURE_OUTPUT_GALAXY_URL_VALUE,
-        galaxyUrl);
+    String galaxyUrl = (String) outputs.get("galaxy_url");
+    Assert.assertEquals("http://10.0.0.1:8080", galaxyUrl);
+  }
+
+  @Test
+  public void testInfrastructureNestedOutputs() throws ImClientException {
+    String infId = getInfrastructureId();
+    InfOutputValues result = getIm().getInfrastructureOutputs(infId);
+    Map<String, Object> outputs = result.getOutputs();
+    Map<String, Object> credentials =
+        (Map<String, Object>) outputs.get("cluster_creds");
+    String user = (String) credentials.get("user");
+    String token = (String) credentials.get("token");
+    Assert.assertEquals("username", user);
+    Assert.assertEquals("password", token);
   }
 
   @Test

src/test/resources/tosca/galaxy_tosca.yaml

@@ -57,4 +57,6 @@ topology_template:
 
   outputs:
     galaxy_url:
-      value: { concat: [ 'http://', get_attribute: [ galaxy_server, public_address, 0 ], ':8080' ] }
+      value: { concat: [ 'http://', get_attribute: [ galaxy_server, public_address, 0 ], ':8080' ] }
+    cluster_creds:
+      value: { get_attribute: [ galaxy_server, credential, 0 ] }