mirror of https://github.com/apache/cloudstack.git
marvin changes for internallbvm provider
- changed the simulator context to load the internallb bean - fixed deployDataCenter to use the additional provider by default - fixed the sandbox script and the setup script for simulator checkin tests Signed-off-by: Prasanna Santhanam <tsp@apache.org>
This commit is contained in:
Prasanna Santhanam
parent
0a2d49301b
commit
9e74fa9406
|
|
@ -205,6 +205,7 @@
|
|||
<ref bean="Ovs"/>
|
||||
<ref bean="SecurityGroupProvider"/>
|
||||
<ref bean="VpcVirtualRouter"/>
|
||||
<ref bean="InternalLbVm"/>
|
||||
<!--
|
||||
<ref bean="BareMetalDhcp"/>
|
||||
<ref bean="BareMetalPxe"/>
|
||||
|
|
|
|||
|
|
@ -45,6 +45,10 @@
|
|||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "VpcVirtualRouter"
|
||||
},
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "InternalLbVm"
|
||||
}
|
||||
],
|
||||
"isolationmethods": [
|
||||
|
|
|
|||
|
|
@ -216,6 +216,18 @@ class deployDataCenters():
|
|||
vrconfig.id = vrprovid
|
||||
self.apiClient.configureVirtualRouterElement(vrconfig)
|
||||
self.enableProvider(pnetprovres[0].id)
|
||||
elif provider.name == 'InternalLbVm':
|
||||
internallbprov = listInternalLoadBalancerElements.listInternalLoadBalancerElementsCmd()
|
||||
internallbprov.nspid = pnetprovres[0].id
|
||||
internallbresponse = self.apiClient.listInternalLoadBalancerElements(internallbprov)
|
||||
internallbid = internallbresponse[0].id
|
||||
|
||||
internallbconfig = \
|
||||
configureInternalLoadBalancerElement.configureInternalLoadBalancerElementCmd()
|
||||
internallbconfig.enabled = "true"
|
||||
internallbconfig.id = internallbid
|
||||
self.apiClient.configureInternalLoadBalancerElement(internallbconfig)
|
||||
self.enableProvider(pnetprovres[0].id)
|
||||
elif provider.name == 'SecurityGroupProvider':
|
||||
self.enableProvider(pnetprovres[0].id)
|
||||
elif provider.name in ['Netscaler', 'JuniperSRX', 'F5BigIp']:
|
||||
|
|
|
|||
|
|
@ -50,6 +50,9 @@ def describeResources(config):
|
|||
|
||||
vpcprovider = provider()
|
||||
vpcprovider.name = 'VpcVirtualRouter'
|
||||
|
||||
lbprovider = provider()
|
||||
lbprovider.name = 'InternalLbVm'
|
||||
|
||||
pn = physical_network()
|
||||
pn.name = "Sandbox-pnet"
|
||||
|
|
@ -60,6 +63,7 @@ def describeResources(config):
|
|||
traffictype("Public", {"simulator":"cloud-simulator-public"})]
|
||||
pn.isolationmethods = ["VLAN"]
|
||||
pn.providers.append(vpcprovider)
|
||||
pn.providers.append(lbprovider)
|
||||
|
||||
pn2 = physical_network()
|
||||
pn2.name = "Sandbox-pnet2"
|
||||
|
|
@ -68,6 +72,7 @@ def describeResources(config):
|
|||
pn2.traffictypes = [traffictype('Guest', {'simulator': 'cloud-simulator-guest'})]
|
||||
pn2.isolationmethods = ["VLAN"]
|
||||
pn2.providers.append(vpcprovider)
|
||||
pn2.providers.append(lbprovider)
|
||||
|
||||
z.physical_networks.append(pn)
|
||||
z.physical_networks.append(pn2)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,209 @@
|
|||
{
|
||||
"zones": [
|
||||
{
|
||||
"name": "Sandbox-Simulator",
|
||||
"guestcidraddress": "10.1.1.0/24",
|
||||
"dns1": "10.147.28.6",
|
||||
"physical_networks": [
|
||||
{
|
||||
"providers": [
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "VirtualRouter"
|
||||
},
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "VpcVirtualRouter"
|
||||
},
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "InternalLb"
|
||||
}
|
||||
],
|
||||
"name": "Sandbox-pnet",
|
||||
"tags": [
|
||||
"cloud-simulator-public"
|
||||
],
|
||||
"broadcastdomainrange": "Zone",
|
||||
"vlan": "675-679",
|
||||
"traffictypes": [
|
||||
{
|
||||
"typ": "Guest"
|
||||
},
|
||||
{
|
||||
"typ": "Management",
|
||||
"simulator": "cloud-simulator-mgmt"
|
||||
},
|
||||
{
|
||||
"typ": "Public",
|
||||
"simulator": "cloud-simulator-public"
|
||||
}
|
||||
],
|
||||
"isolationmethods": [
|
||||
"VLAN"
|
||||
]
|
||||
},
|
||||
{
|
||||
"providers": [
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "VirtualRouter"
|
||||
},
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "VpcVirtualRouter"
|
||||
},
|
||||
{
|
||||
"broadcastdomainrange": "ZONE",
|
||||
"name": "InternalLb"
|
||||
}
|
||||
],
|
||||
"name": "Sandbox-pnet2",
|
||||
"tags": [
|
||||
"cloud-simulator-guest"
|
||||
],
|
||||
"broadcastdomainrange": "Zone",
|
||||
"vlan": "800-1000",
|
||||
"traffictypes": [
|
||||
{
|
||||
"typ": "Guest",
|
||||
"simulator": "cloud-simulator-guest"
|
||||
}
|
||||
],
|
||||
"isolationmethods": [
|
||||
"VLAN"
|
||||
]
|
||||
}
|
||||
],
|
||||
"securitygroupenabled": "false",
|
||||
"ipranges": [
|
||||
{
|
||||
"startip": "10.147.31.150",
|
||||
"endip": "10.147.31.159",
|
||||
"netmask": "255.255.255.0",
|
||||
"vlan": "31",
|
||||
"gateway": "10.147.31.1"
|
||||
}
|
||||
],
|
||||
"networktype": "Advanced",
|
||||
"pods": [
|
||||
{
|
||||
"endip": "10.147.29.159",
|
||||
"name": "POD0",
|
||||
"startip": "10.147.29.150",
|
||||
"netmask": "255.255.255.0",
|
||||
"clusters": [
|
||||
{
|
||||
"clustername": "C0",
|
||||
"hypervisor": "Simulator",
|
||||
"hosts": [
|
||||
{
|
||||
"username": "root",
|
||||
"url": "http://simulator0",
|
||||
"password": "password"
|
||||
}
|
||||
],
|
||||
"clustertype": "CloudManaged",
|
||||
"primaryStorages": [
|
||||
{
|
||||
"url": "nfs://10.147.28.6:/export/home/sandbox/primary",
|
||||
"name": "PS0"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"gateway": "10.147.29.1"
|
||||
}
|
||||
],
|
||||
"internaldns1": "10.147.28.6",
|
||||
"secondaryStorages": [
|
||||
{
|
||||
"url": "nfs://10.147.28.6:/export/home/sandbox/sstor"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"dbSvr": {
|
||||
"dbSvr": "localhost",
|
||||
"passwd": "cloud",
|
||||
"db": "cloud",
|
||||
"port": 3306,
|
||||
"user": "cloud"
|
||||
},
|
||||
"logger": [
|
||||
{
|
||||
"name": "TestClient",
|
||||
"file": "testclient.log"
|
||||
},
|
||||
{
|
||||
"name": "TestCase",
|
||||
"file": "testcase.log"
|
||||
}
|
||||
],
|
||||
"globalConfig": [
|
||||
{
|
||||
"name": "storage.cleanup.interval",
|
||||
"value": "300"
|
||||
},
|
||||
{
|
||||
"name": "direct.agent.load.size",
|
||||
"value": "1000"
|
||||
},
|
||||
{
|
||||
"name": "default.page.size",
|
||||
"value": "10000"
|
||||
},
|
||||
{
|
||||
"name": "instance.name",
|
||||
"value": "QA"
|
||||
},
|
||||
{
|
||||
"name": "workers",
|
||||
"value": "10"
|
||||
},
|
||||
{
|
||||
"name": "vm.op.wait.interval",
|
||||
"value": "5"
|
||||
},
|
||||
{
|
||||
"name": "account.cleanup.interval",
|
||||
"value": "600"
|
||||
},
|
||||
{
|
||||
"name": "guest.domain.suffix",
|
||||
"value": "sandbox.simulator"
|
||||
},
|
||||
{
|
||||
"name": "expunge.delay",
|
||||
"value": "60"
|
||||
},
|
||||
{
|
||||
"name": "vm.allocation.algorithm",
|
||||
"value": "random"
|
||||
},
|
||||
{
|
||||
"name": "expunge.interval",
|
||||
"value": "60"
|
||||
},
|
||||
{
|
||||
"name": "expunge.workers",
|
||||
"value": "3"
|
||||
},
|
||||
{
|
||||
"name": "secstorage.allowed.internal.sites",
|
||||
"value": "10.147.28.0/24"
|
||||
},
|
||||
{
|
||||
"name": "check.pod.cidrs",
|
||||
"value": "true"
|
||||
}
|
||||
],
|
||||
"mgtSvr": [
|
||||
{
|
||||
"mgtSvrIp": "localhost",
|
||||
"passwd": "password",
|
||||
"user": "root",
|
||||
"port": 8096
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Reference in New Issue