cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to d5aed69
Date Thu, 27 Feb 2014 19:54:32 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 93d2c8c3e -> d5aed69c2


CLOUDSTACK-6162: UI > zone > physical network > service provider > OVS > match
provider name "Ovs" in listNetworkServiceProviders API response.


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

Branch: refs/heads/master
Commit: d5aed69c292f27f9c3703eda7c39b5c93de8e2bb
Parents: 93d2c8c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Feb 27 11:40:15 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Feb 27 11:54:13 2014 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5aed69c/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 7668083..c21e277 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -3918,9 +3918,9 @@
                         }
                     },
                     
-                    OVS: {
-                        id: "OVS",
-                        label: "OVS",
+                    Ovs: {
+                        id: "Ovs",
+                        label: "Ovs",
                         isMaximized: true,
                         type: 'detailView',
                         fields: {
@@ -3956,11 +3956,11 @@
                                     }
                                 }],
                                 dataProvider: function(args) {
-                                    refreshNspData("OVS");
+                                    refreshNspData("Ovs");
                                     args.response.success({
                                         actionFilter: ovsProviderActionFilter,
-                                        data: $.extend(nspMap["OVS"], {
-                                            supportedServices: nspMap["OVS"] == undefined?
"": nspMap["OVS"].servicelist.join(', ')
+                                        data: $.extend(nspMap["Ovs"], {
+                                            supportedServices: nspMap["Ovs"] == undefined?
"": nspMap["Ovs"].servicelist.join(', ')
                                         })
                                     });
                                 }
@@ -3971,7 +3971,7 @@
                                 label: 'label.enable.provider',
                                 action: function(args) {
                                     $.ajax({
-                                        url: createURL("updateNetworkServiceProvider&id="
+ nspMap["OVS"].id + "&state=Enabled"),
+                                        url: createURL("updateNetworkServiceProvider&id="
+ nspMap["Ovs"].id + "&state=Enabled"),
                                         dataType: "json",
                                         success: function(json) {
                                             var jid = json.updatenetworkserviceproviderresponse.jobid;
@@ -4002,7 +4002,7 @@
                                 label: 'label.disable.provider',
                                 action: function(args) {
                                     $.ajax({
-                                        url: createURL("updateNetworkServiceProvider&id="
+ nspMap["OVS"].id + "&state=Disabled"),
+                                        url: createURL("updateNetworkServiceProvider&id="
+ nspMap["Ovs"].id + "&state=Disabled"),
                                         dataType: "json",
                                         success: function(json) {
                                             var jid = json.updatenetworkserviceproviderresponse.jobid;
@@ -19126,8 +19126,8 @@
                             case "VpcVirtualRouter":
                             nspMap[ "vpcVirtualRouter"] = items[i];
                             break;
-                            case "OVS":
-                                nspMap["OVS"] = items[i];
+                            case "Ovs":
+                                nspMap["Ovs"] = items[i];
                                 break;      
                             case "Netscaler":
                             nspMap[ "netscaler"] = items[i];
@@ -19260,9 +19260,9 @@
         }
         
         nspHardcodingArray.push({
-            id: 'OVS',
-            name: 'OVS',
-            state: nspMap.OVS ? nspMap.OVS.state : 'Disabled'
+            id: "Ovs",
+            name: "Ovs",
+            state: nspMap.Ovs ? nspMap.Ovs.state : 'Disabled'
         });        
     };
     


Mime
View raw message