deploy kubernetes with API v0.0 works

drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java

@@ -120,11 +120,11 @@ public class ProvisionService {
         try (DRIPCaller provisioner = new ProvisionerCaller(messageBrokerHost);) {
             Message provisionerInvokationMessage = buildProvisionerMessage(req);
 
-            Message response = (provisioner.call(provisionerInvokationMessage));
-//            Message response = generateFakeResponse(System.getProperty("user.home")
-//                    + File.separator + "workspace" + File.separator + "DRIP"
-//                    + File.separator + "doc" + File.separator + "json_samples" + 
-//                    File.separator + "ec2_provisioner_provisoned2.json");
+//            Message response = (provisioner.call(provisionerInvokationMessage));
+            Message response = generateFakeResponse(System.getProperty("user.home")
+                    + File.separator + "workspace" + File.separator + "DRIP"
+                    + File.separator + "doc" + File.separator + "json_samples"
+                    + File.separator + "ec2_provisioner_provisoned2.json");
             List<MessageParameter> params = response.getParameters();
 
             for (MessageParameter p : params) {

drip-api/src/main/java/nl/uva/sne/drip/api/service/ClusterCredentialService.java → drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/DeployController0.java

@@ -13,51 +13,69 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package nl.uva.sne.drip.api.service;
+package nl.uva.sne.drip.api.v0.rest;
 
+import java.util.ArrayList;
 import java.util.List;
-import nl.uva.sne.drip.api.dao.ClusterCredentialsDao;
-import nl.uva.sne.drip.commons.v1.types.ClusterCredentials;
-import nl.uva.sne.drip.commons.v1.types.User;
+import javax.annotation.security.RolesAllowed;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PostAuthorize;
-import org.springframework.security.access.prepost.PostFilter;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
+import nl.uva.sne.drip.api.service.DeployClusterService;
+import nl.uva.sne.drip.api.service.UserService;
+import nl.uva.sne.drip.commons.v0.types.Deploy;
+import nl.uva.sne.drip.commons.v0.types.File;
+import nl.uva.sne.drip.commons.v0.types.Result;
+import nl.uva.sne.drip.commons.v1.types.ClusterCredentials;
+import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
+ * This controller is responsible for deploying a cluster on provisoned
+ * resources.
  *
  * @author S. Koulouzis
  */
-@Service
+@RestController
+@RequestMapping("/user/v0.0/switch/deploy/")
+@Component
 @PreAuthorize("isAuthenticated()")
-public class ClusterCredentialService {
+public class DeployController0 {
 
     @Autowired
-    private ClusterCredentialsDao dao;
+    private DeployClusterService deployService;
 
-    @PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
-    public ClusterCredentials findOne(String id) {
-        return dao.findOne(id);
+    @RequestMapping(value = "/kubernetes", method = RequestMethod.POST, consumes = MediaType.TEXT_XML_VALUE)
+    @RolesAllowed({UserService.USER, UserService.ADMIN})
+    public @ResponseBody
+    Result deployKubernetes(@RequestBody Deploy deploy) {
+        return deploy(deploy, "kubernetes");
     }
 
-    @PostFilter("(filterObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
-    public List<ClusterCredentials> findAll() {
-        return dao.findAll();
+    @RequestMapping(value = "/swarm", method = RequestMethod.POST, consumes = MediaType.TEXT_XML_VALUE)
+    @RolesAllowed({UserService.USER, UserService.ADMIN})
+    public @ResponseBody
+    Result deploySwarm(@RequestBody Deploy deploy) {
+        return deploy(deploy, "swarm");
     }
 
-    @PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
-    public ClusterCredentials delete(String id) {
-        ClusterCredentials cred = dao.findOne(id);
-        dao.delete(cred);
-        return cred;
-    }
+    private Result deploy(Deploy deploy, String clusterType) {
+        String provisionID = deploy.action;
+
+        ClusterCredentials clusterCred = deployService.deployCluster(provisionID, clusterType);
 
-    public ClusterCredentials save(ClusterCredentials clusterCred) {
-        User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        String owner = user.getUsername();
-        clusterCred.setOwner(owner);
-        return dao.save(clusterCred);
+        Result res = new Result();
+        res.info = "INFO";
+        res.status = "Success";
+        List<File> files = new ArrayList<>();
+        File e = new File();
+        e.content = clusterCred.getKey();
+        files.add(e);
+        res.file = files;
+        return res;
     }
 }

drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java

@@ -79,27 +79,8 @@ public class ProvisionController0 {
     @Autowired
     private PlannerService planService;
 
-    @RequestMapping(value = "/get", method = RequestMethod.GET, produces = MediaType.TEXT_XML_VALUE)
-    @RolesAllowed({UserService.USER, UserService.ADMIN})
-    public @ResponseBody
-    Upload provision() {
-        try {
-            Upload up = new Upload();
-            up.user = "user";
-            up.pwd = "123";
-            List<File> files = new ArrayList<>();
-            Plan plan1 = planService.findAll().get(0);
-            File f = Converter.plan1toFile(plan1);
-            files.add(f);
-            up.file = files;
-
-            return up;
-        } catch (JSONException ex) {
-            Logger.getLogger(ProvisionController0.class.getName()).log(Level.SEVERE, null, ex);
-        }
-        return null;
-    }
-
+  
+    
     @RequestMapping(value = "/upload", method = RequestMethod.POST, consumes = MediaType.TEXT_XML_VALUE)
     @RolesAllowed({UserService.USER, UserService.ADMIN})
     public @ResponseBody

drip-api/src/main/java/nl/uva/sne/drip/commons/v0/types/Deploy.java

+/*
+ * Copyright 2017 S. Koulouzis, Wang Junchao, Huan Zhou, Yang Hu 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.uva.sne.drip.commons.v0.types;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ *
+ * @author S. Koulouzis
+ */
+@XmlRootElement
+public class Deploy extends Execute {
+
+}

drip-api/src/main/java/nl/uva/sne/drip/commons/v1/types/ClusterCredentials.java

@@ -19,18 +19,18 @@ import com.webcohesion.enunciate.metadata.DocumentationExample;
 import org.springframework.data.annotation.Id;
 
 /**
-  This class represents the cluster credentials for a cloud. They can used to 
-  * login to the cluster created by the deployer 
-  * 
+ * This class represents the cluster credentials for a cloud. They can used to
+ * login to the cluster created by the deployer
+ *
  * @author S. Koulouzis
  */
-public class ClusterCredentials extends OwnedObject{
+public class ClusterCredentials extends OwnedObject {
 
     @Id
     private String id;
 
     private String key;
-    
+
     public String getId() {
         return id;
     }
@@ -43,7 +43,8 @@ public class ClusterCredentials extends OwnedObject{
     }
 
     /**
-     * The key of the login key. 
+     * The key of the login key.
+     *
      * @return the key
      */
     @DocumentationExample("BEGINRSAPRIVATEKEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3fVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLz0RBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mPJxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48howjUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----ENDRSAPRIVATEKEY-----\\n")
@@ -52,10 +53,10 @@ public class ClusterCredentials extends OwnedObject{
     }
 
     /**
-     * @param contents the key to set
+     * @param key the key to set
      */
-    public void setContents(String contents) {
-        this.key = contents;
+    public void setKey(String key) {
+        this.key = key;
     }
 
 }