- configure the virtual router element for advanced networks only

- enable all service providers created in  a zone
- TODO: basic networking and optionally selecting providers enabled
This commit is contained in:
Prasanna Santhanam 2011-11-30 17:40:42 +05:30
parent 06dda10f31
commit 0b1ca708bb

View File

@ -141,7 +141,7 @@ class deployDataCenters():
self.createVlanIpRanges("Advanced", ipranges, zoneId, networkId=networkId)
def configureProviders(self, providers, zoneid):
def configureProviders(self, providers, zoneid, networktype):
for prov in providers:
pnets = listPhysicalNetworks.listPhysicalNetworksCmd()
pnets.zoneid = zoneid
@ -155,20 +155,16 @@ class deployDataCenters():
upnet.vlan = prov.vlan
upnetresponse = self.apiClient.updatePhysicalNetwork(upnet)
'''only for advanced zone - virtualrouter'''
if networktype == 'Advanced':
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)
pnetprov.state = 'Enabled'
pnetprov.name = 'VirtualRouter'
vrprov = self.apiClient.listNetworkServiceProviders(pnetprov)
vrprov = listVirtualRouterElements.listVirtualRouterElementsCmd()
vrprov.nspid = pnetprovid
vrprov.nspid = vrprov.id
vrprovresponse = self.apiClient.listVirtualRouterElements(vrprov)
vrprovid = vrprovresponse[0].id
@ -177,6 +173,18 @@ class deployDataCenters():
vrconfig.id = vrprovid
vrconfigresponse = self.apiClient.configureVirtualRouterElement(vrconfig)
pnetprov = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
pnetprov.physicalnetworkid = pnetid
pnetprov.state = 'Disabled'
pnetprovs = self.apiClient.listNetworkServiceProviders(pnetprov)
'''enable all the providers'''
for pnetprov in pnetprovs:
upnetprov = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
upnetprov.id = pnetprov.id
upnetprov.state = 'Enabled'
upnetprovresponse = self.apiClient.updateNetworkServiceProvider(upnetprov)
def createZones(self, zones):
for zone in zones:
@ -195,7 +203,7 @@ class deployDataCenters():
zoneId = zoneresponse.id
'''enable physical networks and providers'''
self.configureProviders(zone.providers, zoneId)
self.configureProviders(zone.providers, zoneId, zone.networktype)
'''create pods'''
self.createpods(zone.pods, zone, zoneId)