Merge "Add Network Context Class"

This commit is contained in:
Jenkins 2014-12-18 17:39:56 +00:00 committed by Gerrit Code Review
commit c04f60d2bd
3 changed files with 44 additions and 0 deletions

View File

@ -334,6 +334,28 @@
failure_rate: failure_rate:
max: 0 max: 0
-
args:
auto_assign_nic: True
flavor:
name: "m1.tiny"
image:
name: "^cirros.*uec$"
runner:
type: "constant"
times: 4
concurrency: 4
context:
users:
tenants: 3
users_per_tenant: 2
network:
start_cidr: "100.1.0.0/26"
networks_per_tenant: 2
sla:
failure_rate:
max: 0
NovaServers.boot_and_list_server: NovaServers.boot_and_list_server:
- -
args: args:

View File

@ -922,6 +922,27 @@
failure_rate: failure_rate:
max: 0 max: 0
-
args:
flavor:
name: "m1.tiny"
image:
name: "^cirros.*uec$"
runner:
type: "constant"
times: 3
concurrency: 3
context:
users:
tenants: 3
users_per_tenant: 2
network:
start_cidr: "100.100.0.0/24"
networks_per_tenant: 2
sla:
failure_rate:
max: 0
- -
args: args:
flavor: flavor:

View File

@ -1002,6 +1002,7 @@ class FakeNeutronClient(object):
def create_router(self, data): def create_router(self, data):
router = setup_dict(data["router"], router = setup_dict(data["router"],
defaults={"name": generate_name("router_"), defaults={"name": generate_name("router_"),
"external_gateway_info": None,
"admin_state_up": True}) "admin_state_up": True})
router_id = generate_uuid() router_id = generate_uuid()
router.update({"id": router_id, router.update({"id": router_id,