cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject git commit: updated refs/heads/4.2-forward to c1ea61a
Date Thu, 05 Sep 2013 09:45:24 GMT
Updated Branches:
  refs/heads/4.2-forward 65e85962d -> c1ea61a0e


CLOUDSTACK-4487 Fix adding Netscaler service provider if not already done

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>


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

Branch: refs/heads/4.2-forward
Commit: c1ea61a0e736ce626c0d1f21e90cf9aaf7f89964
Parents: 65e8596
Author: Sowmya Krishnan <sowmya.krishnan@citrix.com>
Authored: Wed Aug 28 23:19:23 2013 +0530
Committer: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Committed: Thu Sep 5 15:06:10 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/common.py | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1ea61a0/tools/marvin/marvin/integration/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py
index d71c749..6ffe951 100644
--- a/tools/marvin/marvin/integration/lib/common.py
+++ b/tools/marvin/marvin/integration/lib/common.py
@@ -68,12 +68,6 @@ def add_netscaler(apiclient, zoneid, NSservice):
     if isinstance(physical_networks, list):
        physical_network = physical_networks[0]
 
-    netscaler = NetScaler.add(
-                    apiclient,
-                    NSservice,
-                    physicalnetworkid=physical_network.id
-                    )
-
     cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
     cmd.name = 'Netscaler'
     cmd.physicalnetworkid=physical_network.id
@@ -81,6 +75,17 @@ def add_netscaler(apiclient, zoneid, NSservice):
 
     if isinstance(nw_service_providers, list):
         netscaler_provider = nw_service_providers[0]
+    else:
+        cmd1 = addNetworkServiceProvider.addNetworkServiceProviderCmd()
+        cmd1.name = 'Netscaler'
+        cmd1.physicalnetworkid = physical_network.id
+        netscaler_provider = apiclient.addNetworkServiceProvider(cmd1)
+
+    netscaler = NetScaler.add(
+                    apiclient,
+                    NSservice,
+                    physicalnetworkid=physical_network.id
+                    )
     if netscaler_provider.state != 'Enabled':
       cmd = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
       cmd.id = netscaler_provider.id


Mime
View raw message