From c1ea61a0e736ce626c0d1f21e90cf9aaf7f89964 Mon Sep 17 00:00:00 2001 From: Sowmya Krishnan Date: Wed, 28 Aug 2013 23:19:23 +0530 Subject: [PATCH] CLOUDSTACK-4487 Fix adding Netscaler service provider if not already done Signed-off-by: venkataswamybabu budumuru --- tools/marvin/marvin/integration/lib/common.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py index d71c749d35f..6ffe951e977 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