added ec2 type credential

docker-compose.yml

@@ -86,18 +86,18 @@ services:
       - "27017:27017"         
             
     
-  manager:
-    depends_on:
-      - rabbit
-      - mongo
-      - sure-tosca
-    image: manager:3.0.0
-    environment:
-      RABBITMQ_HOST: rabbit
-      MONGO_HOST: mongo
-      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
-    ports:
-      - "30000:8080"       
+  #manager:
+    #depends_on:
+      #- rabbit
+      #- mongo
+      #- sure-tosca
+    #image: manager:3.0.0
+    #environment:
+      #RABBITMQ_HOST: rabbit
+      #MONGO_HOST: mongo
+      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+    #ports:
+      #- "30000:8080"       
             
   sure-tosca:
     image: sure-tosca:3.0.0
@@ -112,14 +112,14 @@ services:
     #environment:
       #RABBITMQ_HOST: rabbit
     
-  provisioner:
-    depends_on:
-      - rabbit
-      - sure-tosca
-    image: provisioner:3.0.0
-    environment:
-      RABBITMQ_HOST: rabbit      
-      SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
+  #provisioner:
+    #depends_on:
+      #- rabbit
+      #- sure-tosca
+    #image: provisioner:3.0.0
+    #environment:
+      #RABBITMQ_HOST: rabbit      
+      #SURE_TOSCA_BASE_PATH: http://sure-tosca:8081/tosca-sure/1.0.0
     
   #deployer:
     #depends_on:

manager/src/test/java/nl/uva/sne/drip/service/ServiceTests.java

@@ -406,16 +406,9 @@ public class ServiceTests {
     @Test
     public void testSetProvisionerOperation() throws FileNotFoundException, IOException, MissingCredentialsException, ApiException, TypeExeption, JsonProcessingException, TimeoutException, InterruptedException, NotFoundException, MissingVMTopologyException {
         if (ToscaHelper.isServiceUp(sureToscaBasePath) && ToscaHelper.isServiceUp("http://" + messageBrokerHost + ":15672")) {
-            Credential document = new Credential();
-            document.setCloudProviderName("ExoGENI");
-            Map<String, String> keys = new HashMap<>();
-            keys.put("keystore", "/qTlqams0Ppq2rnaOgL5am7ExGO2nMsOZYM61kiAnsvkOixUuoPy9r4d4OfhwQXXg3lZmeRITjNz4ps+hIDKuxodIQXgBtfMy9Kx8Syb9bIl/MQQls5hWyp9yHAl6vAampoxYu0170lceT1sds4OCz3tM9eF7/UoBQwXBPo94QhO1/vSbtICyVsm3Z2HeGKcBWobT3opZV2w30GqX/7OBmNeIG7RBMPuxLsUxJ9Alahi1zXOUjLkd2bmmVFREngmeubgCzPFxxCQQrZK6WratTzJKc1sRVNK5GJzTwi9BlcZSQSgprum9yVHUgQc6Ylmvdrkhn2g9SlluY2JAZyCZvHYaRBKE4o5bXBDumTy1YAPMNPTfpeeLz+YmH0GMfVwKkxtIBpjb045QseoIWcqxke60WWfJguaTqymXknmcqcLNz+UzUdfVfyurOy9X8xmTGCW5V4N");
-            document.setKeys(keys);
-            document.setToken("secret");
-            document.setTokenType("password");
 
-            String credentialID = credentialService.save(document);
-            assertNotNull(credentialID);
+            addRandomCredential("ExoGENI");
+            addRandomCredential("EC2");
 
             FileInputStream in = new FileInputStream(testApplicationExamplePlanedToscaFilePath);
 
@@ -436,7 +429,7 @@ public class ServiceTests {
                 assertNotNull(attributes.get("credential"));
                 toscaTemplate = dripService.setDesieredSate(toscaTemplate, vmTopology, Constants.NODE_STATES.RUNNING);
             }
-            
+
             Map<String, NodeTemplate> nodes = toscaTemplate.getTopologyTemplate().getNodeTemplates();
             Set<String> names = nodes.keySet();
             for (String name : names) {
@@ -453,4 +446,17 @@ public class ServiceTests {
 
         }
     }
+
+    private void addRandomCredential(String providerName) {
+        Credential document = new Credential();
+        document.setCloudProviderName(providerName);
+        Map<String, String> keys = new HashMap<>();
+        keys.put("keystore", "/qTlqams0Ppq2rnaOgL5am7ExGO2nMsOZYM61kiAnsvkOixUuoPy9r4d4OfhwQXXg3lZmeRITjNz4ps+hIDKuxodIQXgBtfMy9Kx8Syb9bIl/MQQls5hWyp9yHAl6vAampoxYu0170lceT1sds4OCz3tM9eF7/UoBQwXBPo94QhO1/vSbtICyVsm3Z2HeGKcBWobT3opZV2w30GqX/7OBmNeIG7RBMPuxLsUxJ9Alahi1zXOUjLkd2bmmVFREngmeubgCzPFxxCQQrZK6WratTzJKc1sRVNK5GJzTwi9BlcZSQSgprum9yVHUgQc6Ylmvdrkhn2g9SlluY2JAZyCZvHYaRBKE4o5bXBDumTy1YAPMNPTfpeeLz+YmH0GMfVwKkxtIBpjb045QseoIWcqxke60WWfJguaTqymXknmcqcLNz+UzUdfVfyurOy9X8xmTGCW5V4N");
+        document.setKeys(keys);
+        document.setToken("secret");
+        document.setTokenType("password");
+        String credentialID = credentialService.save(document);
+        assertNotNull(credentialID);
+
+    }
 }