etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

reverting changes related to provider. not part of 2.2.y

This commit is contained in:
Prasanna Santhanam 2011-12-15 00:13:42 +05:30
parent fb03f61f1d
commit 5338828f76
2 changed files with 2 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
tools/testClient/configGenerator.py
View File

@ -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

42
tools/testClient/deployDataCenter.py
View File

@ -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)