apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

typos and other fixes

Browse Source
This commit is contained in:
Prasanna Santhanam 2011-12-29 17:08:08 +05:30
parent e9b861432a
commit 9c8f989d6b
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/testClient/configGenerator.py
View File

@ -48,9 +48,10 @@ class zone():
self.guestcidraddress = None self.guestcidraddress = None
self.internaldns2 = None self.internaldns2 = None
self.securitygroupenabled = None self.securitygroupenabled = None
''' Guest Vlan range - only advanced zone'''
self.vlan = None
'''default public network, in advanced mode''' '''default public network, in advanced mode'''
self.ipranges = [] self.ipranges = []
'''tagged network, in advanced mode'''
self.networks = [] self.networks = []
self.providers = [] self.providers = []
self.pods = [] self.pods = []
@ -61,8 +62,6 @@ class provider():
self.name = None self.name = None
self.state = None self.state = None
self.broadcastdomainrange = 'ZONE' self.broadcastdomainrange = 'ZONE'
''' Guest Vlan range'''
self.vlan = None
self.zoneid = None self.zoneid = None
self.servicelist = [] self.servicelist = []

47
tools/testClient/deployDataCenter.py
View File

@ -127,7 +127,7 @@ class deployDataCenters():
networkcmd.zoneid = zoneId networkcmd.zoneid = zoneId
ipranges = network.ipranges ipranges = network.ipranges
if ipranges is not None: if ipranges:
iprange = ipranges.pop() iprange = ipranges.pop()
networkcmd.startip = iprange.startip networkcmd.startip = iprange.startip
networkcmd.endip = iprange.endip networkcmd.endip = iprange.endip
@ -140,21 +140,22 @@ class deployDataCenters():
self.createVlanIpRanges(mode, ipranges, zoneId, networkId=networkId) self.createVlanIpRanges(mode, ipranges, zoneId, networkId=networkId)
def enablePhysicalNetwork(self, zoneid, vlan=None): def enablePhysicalNetwork(self, zoneid, vlan=None):
pnets = listPhysicalNetworks.listPhysicalNetworksCmd() pnets = listPhysicalNetworks.listPhysicalNetworksCmd()
pnets.zoneid = zoneid pnets.zoneid = zoneid
pnets.state = 'Disabled' pnets.state = 'Disabled'
pnetsresponse = self.apiClient.listPhysicalNetworks(pnets) pnetsresponse = self.apiClient.listPhysicalNetworks(pnets)
upnet = updatePhysicalNetwork.updatePhysicalNetworkCmd() upnet = updatePhysicalNetwork.updatePhysicalNetworkCmd()
upnet.state = 'Enabled' upnet.state = 'Enabled'
upnet.id = pnetsresponse[0].id upnet.id = pnetsresponse[0].id
if vlan is not None: ''' enable guest VLAN in Advanced mode '''
upnet.vlan = prov.vlan if vlan:
upnetresponse = self.apiClient.updatePhysicalNetwork(upnet) upnet.vlan = vlan
upnetresponse = self.apiClient.updatePhysicalNetwork(upnet)
return pnetsresponse return pnetsresponse
def configureProviders(self, phynetwrk, providers, zoneid, networktype): def configureProviders(self, phynetwrk, providers, networktype):
pnetprov = listNetworkServiceProviders.listNetworkServiceProvidersCmd() pnetprov = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
pnetprov.physicalnetworkid = phynetwrk[0].id pnetprov.physicalnetworkid = phynetwrk[0].id
pnetprov.state = 'Enabled' pnetprov.state = 'Enabled'
@ -173,7 +174,9 @@ class deployDataCenters():
vrconfigresponse = self.apiClient.configureVirtualRouterElement(vrconfig) vrconfigresponse = self.apiClient.configureVirtualRouterElement(vrconfig)
#Enable VirtualRouter provider by default #Enable VirtualRouter provider by default
providers.append('VirtualRouter') vrprovider = configGenerator.provider()
vrprovider.name = 'VirtualRouter'
providers.append(vrprovider)
#Enable additional providers in this physical network by name #Enable additional providers in this physical network by name
for prov in providers: for prov in providers:
@ -184,7 +187,7 @@ class deployDataCenters():
pnetprovs = self.apiClient.listNetworkServiceProviders(pnetprov) pnetprovs = self.apiClient.listNetworkServiceProviders(pnetprov)
upnetprov = updateNetworkServiceProvider.updateNetworkServiceProviderCmd() upnetprov = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
upnetprov.id = pnetprovs.id upnetprov.id = pnetprovs[0].id
upnetprov.state = 'Enabled' upnetprov.state = 'Enabled'
upnetprovresponse = self.apiClient.updateNetworkServiceProvider(upnetprov) upnetprovresponse = self.apiClient.updateNetworkServiceProvider(upnetprov)
@ -205,23 +208,21 @@ class deployDataCenters():
zoneId = zoneresponse.id zoneId = zoneresponse.id
'''enable physical networks and providers''' '''enable physical networks and providers'''
phynetwrk = self.enablePhysicalNetwork(zoneid, prov.vlan) phynetwrk = self.enablePhysicalNetwork(zoneId, zone.vlan)
self.configureProviders(phynetwrk, zone.providers, zoneId, zone.networktype) self.configureProviders(phynetwrk, zone.providers, zone.networktype)
if mode == "Basic": if zone.networktype == "Basic":
'''create the guest network from the sharednetworkoffering''' '''create the guest network from the sharednetworkoffering'''
listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd() listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd()
listnetworkoffering.name = "DefaultSharedNetworkOfferingWithSGService" listnetworkoffering.name = "DefaultSharedNetworkOfferingWithSGService"
listnetworkofferingresponse = self.apiClient.listNetworkOfferings(listnetworkoffering) listnetworkofferingresponse = self.apiClient.listNetworkOfferings(listnetworkoffering)
guestntwrk = network() guestntwrk = configGenerator.network()
guestntwrk.displaytext = "guestNetworkForBasicZone" guestntwrk.displaytext = "guestNetworkForBasicZone"
guestntwrk.name = "guestNetworkForBasicZone" guestntwrk.name = "guestNetworkForBasicZone"
guestntwrk.zoneid = zoneId guestntwrk.zoneid = zoneId
guestntwrk.networkofferingid = listnetworkserviceprovidersresponse[0].id guestntwrk.networkofferingid = listnetworkofferingresponse[0].id
zone.networks.append(guestntwrk) self.createnetworks([guestntwrk], zoneId, zone.networktype)
self.createnetworks(zone.networks, zoneId, zone.networktype)
'''create pods''' '''create pods'''
self.createpods(zone.pods, zone, zoneId) self.createpods(zone.pods, zone, zoneId)