change schema

drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/ProvisionerRPCService.java → drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/CloudStormService.java

@@ -15,6 +15,9 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import nl.uva.sne.drip.model.CloudsStormSubTopology;
+import nl.uva.sne.drip.model.CloudsStormTopTopology;
+import nl.uva.sne.drip.model.CloudsStormVM;
 import nl.uva.sne.drip.model.ToscaTemplate;
 import org.apache.commons.io.FilenameUtils;
 
@@ -22,7 +25,7 @@ import org.apache.commons.io.FilenameUtils;
  *
  * @author S. Koulouzis
  */
-class ProvisionerRPCService {
+class CloudStormService {
 
     private List<Map.Entry> vmTopologies;
     private String tempInputDirPath;
@@ -39,8 +42,14 @@ class ProvisionerRPCService {
         return toscaTemplate;
     }
 
-    private Map<String, Object> buildCloudStormTopTopology(ToscaTemplate toscaTemplate) throws JSchException, IOException {
-        Map<String, Object> topTopology = new HashMap<>();
+    private CloudsStormTopTopology buildCloudStormTopTopology(ToscaTemplate toscaTemplate) throws JSchException, IOException {
+        CloudsStormTopTopology topTopology = new CloudsStormTopTopology();
+        String publicKeyPath = buildSSHKeyPair();
+        topTopology.setPublicKeyPath(publicKeyPath);
+        topTopology.setUserName(getUserName());
+        List<CloudsStormSubTopology> topologies = getCloudsStormSubTopologies(toscaTemplate);
+        topTopology.setTopologies(topologies);
+
         return topTopology;
     }
 
@@ -56,4 +65,23 @@ class ProvisionerRPCService {
         return publicKeyPath;
     }
 
+    private String getUserName() {
+        return "vm_user";
+    }
+
+    private List<CloudsStormSubTopology> getCloudsStormSubTopologies(ToscaTemplate toscaTemplate) {
+        List<CloudsStormSubTopology> cloudsStormSubTopologies = new ArrayList<>();
+     
+        CloudsStormSubTopology cloudsStormSubTopology = new CloudsStormSubTopology();
+        List<CloudsStormVM> vms  = new ArrayList<>();
+        CloudsStormVM cloudsStormVM = new CloudsStormVM();
+        cloudsStormVM.setName("Node1");
+        
+        vms.add(cloudsStormVM);
+        
+        cloudsStormSubTopology.setVms(vms);
+        cloudsStormSubTopology.
+        return cloudsStormSubTopologies;
+    }
+
 }

drip-provisioner/src/main/java/nl/uva/sne/drip/provisioner/Consumer.java

@@ -69,7 +69,7 @@ public class Consumer extends DefaultConsumer {
                 throw new FileNotFoundException("Could not create input directory: " + tempInputDir.getAbsolutePath());
             }
 
-            ProvisionerRPCService service = new ProvisionerRPCService();
+            CloudStormService service = new CloudStormService();
             ToscaTemplate toscaTemplate = service.execute(message.getToscaTemplate());
 
             Message responceMessage = new Message();

openAPI/schema/CloudsStormSubTopology.yml

     CloudsStormSubTopology:
         type: "object"
         properties:
-            VMs:
-                type: array
-                items:
-                    $ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormVM.yml#/CloudsStormVM'
+            topology:
+                type: "string"
+            cloudProvider:
+                type: "string"
+            domain:
+                type: "string"
+            status:
+                type: "string"
+                
+            #VMs:
+                #type: array
+                #items:
+                    #$ref: 'https://raw.githubusercontent.com/skoulouzis/CONF/DRIP_3.0/openAPI/schema/CloudsStormVM.yml#/CloudsStormVM'