Repository: cloudstack Updated Branches: refs/heads/master 281c86620 -> a698c3e27
LOUDSTACK-6840: OVS refers to SDN provider. However, we are not supporting SDN in this release. Therefore, remove OVS from UI for this release. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a698c3e2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a698c3e2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a698c3e2 Branch: refs/heads/master Commit: a698c3e276bf916d23f7253ed456d076e176fa94 Parents: 281c866 Author: Jessica Wang <[email protected]> Authored: Thu Sep 11 10:56:11 2014 -0700 Committer: Jessica Wang <[email protected]> Committed: Thu Sep 11 10:57:03 2014 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a698c3e2/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index ed53fd2..54aafe2 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -20751,12 +20751,7 @@ id: 'BaremetalPxeProvider', name: 'Baremetal PXE', state: nspMap.BaremetalPxeProvider ? nspMap.BaremetalPxeProvider.state: 'Disabled' - }, - { - id: 'Ovs', - name: 'Ovs', - state: nspMap.Ovs ? nspMap.Ovs.state: 'Disabled' - }, + }, { id: 'Opendaylight', name: 'OpenDaylight (Experimental)', @@ -20819,16 +20814,16 @@ name: 'GloboDNS', state: nspMap.GloboDns ? nspMap.GloboDns.state : 'Disabled' }); - } - - if ($.grep(nspHardcodingArray, function(e) { return e.id == 'Ovs'; }).length == 0 ) { - nspHardcodingArray.push({ + + //CLOUDSTACK-6840: OVS refers to SDN provider. However, we are not supporting SDN in this release. + /* + nspHardcodingArray.push({ id: 'Ovs', name: 'Ovs', - state: nspMap.Ovs ? nspMap.Ovs.state : 'Disabled' - }); - } - + state: nspMap.Ovs ? nspMap.Ovs.state: 'Disabled' + }); + */ + } }; cloudStack.actionFilter.physicalNetwork = function (args) {
