cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [16/20] git commit: updated refs/heads/4.3 to 3297fcc
Date Wed, 05 Mar 2014 07:53:01 GMT
CLOUDSTACK-6162: UI > zone > physical network > service provider > OVS > match
provider name "Ovs" in listNetworkServiceProviders API response.
(cherry picked from commit 930acdde3d9c9a6ef1db90ae2f6ba3a9d8f15959)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


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

Branch: refs/heads/4.3
Commit: e9a3d412850c86b21b8d8b8be373a57a132c0312
Parents: 2457a92
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Feb 27 11:40:15 2014 -0800
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Tue Mar 4 23:42:24 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9a3d412/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9ba2597..0c56baf 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -3868,9 +3868,9 @@
                         }
                     },
 
-                    OVS: {
-                        id: "OVS",
-                        label: "OVS",
+                    Ovs: {
+                        id: "Ovs",
+                        label: "Ovs",
                         isMaximized: true,
                         type: 'detailView',
                         fields: {
@@ -3906,11 +3906,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(', ')
                                         })
                                     });
                                 }
@@ -3921,7 +3921,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;
@@ -3952,7 +3952,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;
@@ -18123,8 +18123,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];
@@ -18236,9 +18236,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