stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From daksh...@apache.org
Subject stratos git commit: jira [STRATOS-1433] add iaas provider listing
Date Tue, 16 Jun 2015 09:31:07 GMT
Repository: stratos
Updated Branches:
  refs/heads/master 563324abf -> 0aa72975d


jira [STRATOS-1433] add iaas provider listing


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

Branch: refs/heads/master
Commit: 0aa72975de3fad1936888c3ecda93c2b26c15928
Parents: 563324a
Author: Dakshika Jayathilaka <sinhaladjs@gmail.com>
Authored: Tue Jun 16 15:00:19 2015 +0530
Committer: Dakshika Jayathilaka <sinhaladjs@gmail.com>
Committed: Tue Jun 16 15:00:19 2015 +0530

----------------------------------------------------------------------
 .../console/configure_form.jag                                   | 4 ++++
 .../console/controllers/rest/rest_calls.jag                      | 4 ++++
 2 files changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/0aa72975/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index e1fc2bb..3c39cb2 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -66,6 +66,10 @@ if (!elements) {
                 formDataRaw = require('controllers/forms/default/configure/' + elements.formtype
+ '.json'),
                 formTitle = formData.title,
                 buttonText = formData.name;
+
+        var iaasProviders = util.RESTCalls.getIaaSProviders();
+        formData['properties']['provider']['enum'] = iaasProviders['iaasProviders'];
+
     } catch (e) {
         log.error(e.message);
         error.push({"errorMessage": e.message});

http://git-wip-us.apache.org/repos/asf/stratos/blob/0aa72975/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index ed3d97c..ed5d42a 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -234,6 +234,10 @@ RESTCalls = new function(){
         return this.sendReceive("GET","/cartridgeGroups",{});
     };
 
+    this.getIaaSProviders = function(){
+        return this.sendReceive("GET","/iaasProviders",{});
+    };
+
     this.getApplications = function(){
         return this.sendReceive("GET","/applications",{});
     };


Mime
View raw message