From 5338828f76450a0434517181fadb87b4de43a89e Mon Sep 17 00:00:00 2001
From: Prasanna Santhanam <Prasanna.Santhanam@citrix.com>
Date: Thu, 15 Dec 2011 00:13:42 +0530
Subject: [PATCH] reverting changes related to provider. not part of 2.2.y

---
 tools/testClient/configGenerator.py  | 25 +----------------
 tools/testClient/deployDataCenter.py | 42 +---------------------------
 2 files changed, 2 insertions(+), 65 deletions(-)

diff --git a/tools/testClient/configGenerator.py b/tools/testClient/configGenerator.py
index da03f5e48e8..3baa3edcf52 100644
--- a/tools/testClient/configGenerator.py
+++ b/tools/testClient/configGenerator.py
@@ -48,37 +48,14 @@ class zone():
         self.guestcidraddress = None
         self.internaldns2 = None
         self.securitygroupenabled = None
+        self.vlan = None
         '''default public network, in advanced mode'''
         self.ipranges = []
         '''tagged network, in advanced mode'''
         self.networks = []
-        self.providers = []
         self.pods = []
         self.secondaryStorages = []
         
-class provider():
-    def __init__(self):
-        self.name = None
-        self.state = None
-        self.broadcastdomainrange = 'ZONE'
-        ''' Guest Vlan range'''
-        self.vlan = None
-        self.zoneid = None
-        self.servicelist = []
-
-        #self.vpn_service_provided = None
-        #self.dhcp_service_provided = None
-        #self.dns_service_provided = None
-        #self.gateway_service_provided = None
-        #self.firewall_service_provided = None
-        #self.source_nat_service_provided = None
-        #self.load_balance_service_provided = None
-        #self.static_nat_service_provided = None
-        #self.port_forwarding_service_provided = None
-        #self.user_data_service_provided = None
-        #self.security_group_service_provided = None
-
-
 class pod():
     def __init__(self):
         self.gateway = None
diff --git a/tools/testClient/deployDataCenter.py b/tools/testClient/deployDataCenter.py
index 7f2d3b7cbed..7ebd9cbdf08 100644
--- a/tools/testClient/deployDataCenter.py
+++ b/tools/testClient/deployDataCenter.py
@@ -138,46 +138,8 @@ class deployDataCenters():
             networkcmd.networkofferingid = network.networkofferingid
             networkcmdresponse = self.apiClient.createNetwork(networkcmd)
             networkId = networkcmdresponse.id
-            
             self.createVlanIpRanges("Advanced", ipranges, zoneId, networkId=networkId)
 
-    def configureProviders(self, providers, zoneid):
-        for prov in providers:
-		    pnets = listPhysicalNetworks.listPhysicalNetworksCmd()
-		    pnets.zoneid = zoneid
-		    pnets.state = 'Disabled'
-		    pnetsresponse = self.apiClient.listPhysicalNetworks(pnets)
-		    pnetid = pnetsresponse[0].id
-		
-		    upnet = updatePhysicalNetwork.updatePhysicalNetworkCmd()
-		    upnet.state = 'Enabled'
-		    upnet.id = pnetid
-		    upnet.vlan = prov.vlan
-		    upnetresponse = self.apiClient.updatePhysicalNetwork(upnet)
-		
-		    pnetprov = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
-		    pnetprov.physicalnetworkid = pnetid
-		    pnetprov.state = 'Disabled'
-		    pnetprovresponse = self.apiClient.listNetworkServiceProviders(pnetprov)
-		    pnetprovid = pnetprovresponse[0].id
-		
-            #TODO: Only enables default - should also update service list - VPN/LB/DNS/DHCP/FW
-		    upnetprov = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
-		    upnetprov.id = pnetprovid
-		    upnetprov.state = 'Enabled'
-		    upnetprovresponse = self.apiClient.updateNetworkServiceProvider(upnetprov)
-		
-		    vrprov = listVirtualRouterElements.listVirtualRouterElementsCmd()
-		    vrprov.nspid = pnetprovid
-		    vrprovresponse = self.apiClient.listVirtualRouterElements(vrprov)
-		    vrprovid = vrprovresponse[0].id
-		
-		    vrconfig = configureVirtualRouterElement.configureVirtualRouterElementCmd()
-		    vrconfig.enabled = 'true'
-		    vrconfig.id = vrprovid
-		    vrconfigresponse = self.apiClient.configureVirtualRouterElement(vrconfig)
-
-
     def createZones(self, zones):
         for zone in zones:
             '''create a zone'''
@@ -190,12 +152,10 @@ class deployDataCenters():
             createzone.name = zone.name
             createzone.securitygroupenabled = zone.securitygroupenabled
             createzone.networktype = zone.networktype
+            createzone.vlan = zone.vlan
             
             zoneresponse = self.apiClient.createZone(createzone)
             zoneId = zoneresponse.id
-
-            '''enable physical networks and providers'''
-            self.configureProviders(zone.providers, zoneId)
             
             '''create pods'''
             self.createpods(zone.pods, zone, zoneId)