You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2015/01/19 06:29:59 UTC

stratos git commit: Fixed some issue in CLI and samples

Repository: stratos
Updated Branches:
  refs/heads/master e3c61f722 -> 2b37b741e


Fixed some issue in CLI and samples


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2b37b741
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2b37b741
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2b37b741

Branch: refs/heads/master
Commit: 2b37b741eb3fea612388d1222e8eb22a7db0f5f1
Parents: e3c61f7
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Mon Jan 19 05:29:23 2015 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Mon Jan 19 05:29:44 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/stratos/cli/RestClient.java |  4 +-
 .../stratos/cli/RestCommandLineService.java     |  4 +-
 .../mock/artifacts/app_single_group.json        | 18 -------
 .../mock/artifacts/application-signup.json      | 18 +++++++
 .../mock/artifacts/application.json             | 24 +++++++++
 .../mock/artifacts/autoscale-policy.json        | 22 ++++-----
 .../mock/artifacts/dep_single_group.json        | 42 ----------------
 .../mock/artifacts/deployment-policy.json       | 41 +++++++++++++++
 .../mock/artifacts/tomcat-cartridge.json        | 46 +++++++++++++++++
 .../single-cartridge/mock/artifacts/tomcat.json | 52 --------------------
 samples/single-cartridge/mock/deploy.sh         | 15 ++++--
 11 files changed, 154 insertions(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
index b9fd977..af1c8a4 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestClient.java
@@ -159,10 +159,10 @@ public class RestClient implements GenericRestClient {
         try {
             int responseCode = executePost(serviceEndpoint, entityBody);
             if (responseCode == 201) {
-                System.out.println(String.format("Successfully deployed %s", entityName));
+                System.out.println(String.format("Successfully added %s", entityName));
             }
         } catch (Exception e) {
-            String message = String.format("Error in deploying %s", entityName);
+            String message = String.format("Error in adding %s", entityName);
             System.out.println(message);
             logger.error(message, e);
         }

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
index f38544e..679f513 100644
--- a/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
+++ b/components/org.apache.stratos.cli/src/main/java/org/apache/stratos/cli/RestCommandLineService.java
@@ -508,7 +508,7 @@ public class RestCommandLineService {
             Gson gson = gsonBuilder.create();
 
             if (responseCode.equals(CliConstants.RESPONSE_OK)) {
-                System.out.println("You have succesfully deactivate " + tenantDomain + " tenant");
+                System.out.println("You have succesfully deactivated " + tenantDomain + " tenant");
                 return;
             } else {
                 String resultString = CliUtils.getHttpResponseString(response);
@@ -537,7 +537,7 @@ public class RestCommandLineService {
             Gson gson = gsonBuilder.create();
 
             if (responseCode.equals(CliConstants.RESPONSE_OK)) {
-                System.out.println("You have succesfully activated tenant: " + tenantDomain);
+                System.out.println("You have succesfully activated " + tenantDomain + " tenant");
                 return;
             } else {
                 String resultString = CliUtils.getHttpResponseString(response);

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/app_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/app_single_group.json b/samples/single-cartridge/mock/artifacts/app_single_group.json
deleted file mode 100644
index 9e996c2..0000000
--- a/samples/single-cartridge/mock/artifacts/app_single_group.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "applicationId": "app_cartridge_v1",
-    "alias": "mytestapp1",
-    "components": {
-        "cartridges": [
-            {
-                "type": "tomcat",
-                "cartridgeMin": 2,
-                "cartridgeMax": 5,
-                "subscribableInfo": {
-                    "alias": "mytomcat",
-                    "autoscalingPolicy": "autoscale_policy_1"
-                }
-            }
-        ]
-    }
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/application-signup.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/application-signup.json b/samples/single-cartridge/mock/artifacts/application-signup.json
new file mode 100644
index 0000000..179616d
--- /dev/null
+++ b/samples/single-cartridge/mock/artifacts/application-signup.json
@@ -0,0 +1,18 @@
+{
+   "artifactRepositories":[
+      {
+         "alias":"php",
+         "privateRepo":false,
+         "repoUrl":"https://github.com/imesh/stratos-php-applications.git",
+         "repoUsername":"",
+         "repoPassword":""
+      },
+      {
+         "alias":"tomcat",
+         "privateRepo":false,
+         "repoUrl":"https://github.com/imesh/stratos-php-applications.git",
+         "repoUsername":"",
+         "repoPassword":""
+      }
+   ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/application.json b/samples/single-cartridge/mock/artifacts/application.json
new file mode 100644
index 0000000..5d22879
--- /dev/null
+++ b/samples/single-cartridge/mock/artifacts/application.json
@@ -0,0 +1,24 @@
+{  
+   "applicationId":"single-cartridge-app",
+   "alias":"single-cartridge-app",
+   "multiTenant":true,
+   "components":{  
+      "cartridges":[  
+         {  
+            "type":"tomcat",
+                "cartridgeMin": 1,
+                "cartridgeMax": 10,    
+				"subscribableInfo":{  
+               	"alias":"tomcat",
+               	"autoscalingPolicy":"autoscale-policy-1",
+                "artifactRepository":{
+                   "privateRepo":false,
+                   "repoUrl":"https://github.com/imesh/stratos-php-applications.git",
+                   "repoUsername":"",
+                   "repoPassword":""
+                }
+            }
+         }
+      ]
+   }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/autoscale-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/autoscale-policy.json b/samples/single-cartridge/mock/artifacts/autoscale-policy.json
old mode 100755
new mode 100644
index 9e9ad99..918aadd
--- a/samples/single-cartridge/mock/artifacts/autoscale-policy.json
+++ b/samples/single-cartridge/mock/artifacts/autoscale-policy.json
@@ -1,14 +1,14 @@
 {
-    "id": "autoscale_policy_1",
-    "loadThresholds": {
-        "requestsInFlight": {
-            "threshold": 80
-        },
-        "memoryConsumption": {
-            "threshold": 90
-        },
-        "loadAverage": {
-            "threshold": 50
-        }
+  "id": "autoscale-policy-1",
+  "loadThresholds": {
+    "requestsInFlight": {
+      "threshold": 50
+    },
+    "memoryConsumption": {
+      "threshold": 40
+    },
+    "loadAverage": {
+      "threshold": 40
     }
+  }
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/dep_single_group.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/dep_single_group.json b/samples/single-cartridge/mock/artifacts/dep_single_group.json
deleted file mode 100644
index 629d024..0000000
--- a/samples/single-cartridge/mock/artifacts/dep_single_group.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "applicationId": "app_cartridge_v1",
-    "applicationPolicy": {
-        "applicationId": "app_cartridge_v1",
-        "networkPartition": [
-            {
-                "id": "openstack_R1",
-                "activeByDefault": "true",
-                "partitions": [
-                    {
-                        "id": "P1",
-                        "provider": "mock",
-                        "property": [
-                            {
-                                "name": "region",
-                                "value": "RegionOne"
-                            }
-                        ]
-                    }
-                ]
-            }
-        ]
-    },
-    "childPolicies": [
-        {
-            "alias": "mytomcat",
-            "networkPartition": [
-                {
-                    "id": "openstack_R1",
-                    "partitionAlgo": "one-after-another",
-                    "partitions": [
-                        {
-                            "id": "P1",
-                            "max": 8
-                        }
-                    ]
-                }
-            ]
-        }
-    ]
-}
-

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/deployment-policy.json b/samples/single-cartridge/mock/artifacts/deployment-policy.json
new file mode 100644
index 0000000..76768bd
--- /dev/null
+++ b/samples/single-cartridge/mock/artifacts/deployment-policy.json
@@ -0,0 +1,41 @@
+{
+	"applicationId":"single-cartridge-app",
+    "applicationPolicy": {
+        "networkPartition": [
+            {
+                "id": "network-p1",
+                "activeByDefault": "true",
+                "partitions": [
+                    {
+                        "id": "p1",
+                        "provider": "mock",
+                        "property": [
+                            {
+                                "name": "region",
+                                "value": "default"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    },
+    "childPolicies": [
+        {
+            "alias": "tomcat",
+            "networkPartition": [
+                {
+                    "id": "network-p1",
+                    "partitionAlgo": "one-after-another",
+                    "partitions": [
+                        {
+                            "id": "p1",
+                            "max": 5
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
+

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json b/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
new file mode 100644
index 0000000..8a41d6a
--- /dev/null
+++ b/samples/single-cartridge/mock/artifacts/tomcat-cartridge.json
@@ -0,0 +1,46 @@
+{
+   "type":"tomcat",
+   "category":"framework",
+   "provider":"apache",
+   "host":"tomcat.apache.org",
+   "displayName":"tomcat",
+   "description":"Apache Tomcat",
+   "version":"7",
+   "multiTenant":"false",
+   "portMapping":[
+      {
+         "protocol":"http",
+         "port":"22",
+         "proxyPort":"8280"
+      }
+   ],
+   "deployment":{
+
+   },
+   "iaasProvider":[
+      {
+         "type":"mock",
+         "imageId":"",
+         "networkInterfaces":[
+            {
+               "name":"network-non-routable",
+               "networkUuid":""
+            }
+         ],
+         "property":[
+            {
+               "name":"instanceType",
+               "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
+            },
+            {
+               "name":"keyPair",
+               "value":"imesh-key"
+            },
+            {
+               "name":"securityGroups",
+               "value":"default"
+            }
+         ]
+      }
+   ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/artifacts/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/artifacts/tomcat.json b/samples/single-cartridge/mock/artifacts/tomcat.json
deleted file mode 100755
index 7531ba6..0000000
--- a/samples/single-cartridge/mock/artifacts/tomcat.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-    "type": "tomcat",
-    "provider": "apache",
-    "category": "data",
-    "host": "isuruh.lk",
-    "displayName": "tomcat",
-    "description": "tomcat Cartridge",
-    "version": "7",
-    "multiTenant": "false",
-    "portMapping": [
-        {
-            "protocol": "http",
-            "port": "22",
-            "proxyPort": "8280"
-        }
-    ],
-    "deployment": {
-    },
-    "iaasProvider": [
-        {
-            "type": "mock",
-            "imageId": "RegionOne/b4ca55e3-58ab-4937-82ce-817ebd10240e",
-            "networkInterfaces": [
-                {
-                    "name": "network-non-routable",
-                    "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
-                }
-            ],
-            "maxInstanceLimit": "2",
-            "property": [
-                {
-                    "name": "instanceType",
-                    "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594"
-                },
-                {
-                    "name": "keyPair",
-                    "value": "reka"
-                },
-                {
-                    "name": "securityGroups",
-                    "value": "default"
-                }
-            ]
-        }
-    ],
-    "loadBalancer": {
-        "property": {
-            "name": "no.load.balancer",
-            "value": "true"
-        }
-    },
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/2b37b741/samples/single-cartridge/mock/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/single-cartridge/mock/deploy.sh b/samples/single-cartridge/mock/deploy.sh
index d57b104..385d80b 100755
--- a/samples/single-cartridge/mock/deploy.sh
+++ b/samples/single-cartridge/mock/deploy.sh
@@ -1,15 +1,20 @@
 #!/bin/sh 
 
+echo "Adding autoscaling policy..."
+curl -X POST -H "Content-Type: application/json" -d @'artifacts/autoscale-policy.json' -k -u admin:admin https://localhost:9443/api/autoscalingPolicies
 
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/autoscale-policy.json' -k -v -u admin:admin https://localhost:9443/api/autoscalingPolicies
+sleep 1
 
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat.json' -k -v -u admin:admin https://localhost:9443/api/cartridges
+echo "Adding tomcat cartridge..."
+curl -X POST -H "Content-Type: application/json" -d @'artifacts/tomcat-cartridge.json' -k -u admin:admin https://localhost:9443/api/cartridges
 
 sleep 5
 
-curl -X POST -H "Content-Type: application/json" -d @'artifacts/app_single_group.json' -k -v -u admin:admin https://localhost:9443/api/applications
-
+echo "Adding application..."
+curl -X POST -H "Content-Type: application/json" -d @'artifacts/application.json' -k -u admin:admin https://localhost:9443/api/applications
 
 sleep 5 
 
-curl -X POST -H "Content-Type: application/json" -d@'artifacts/dep_single_group.json' -k -v -u admin:admin https://localhost:9443/api/applications/app_cartridge_v1/deploy
+echo "Deploying application..."
+curl -X POST -H "Content-Type: application/json" -d@'artifacts/deployment-policy.json' -k -u admin:admin https://localhost:9443/api/applications/single-cartridge-app/deploy
+