From 878770990beb5641ad70a4f669fd263e891dd1bb Mon Sep 17 00:00:00 2001 From: Thomas Duval Date: Tue, 6 Sep 2016 15:52:54 +0200 Subject: Update federation tests and nova commands. Change-Id: I8eed3fdc79ce72521a9db26d527c73a106fdd08f --- .../tests/tests_empty_policy_new_user.json | 52 +++++++++++++++++++--- .../moonclient/tests/tests_empty_policy_nova.json | 46 ++++++++++++++++++- .../moonclient/tests/tests_external_commands.json | 46 ++++++++++++++++++- 3 files changed, 135 insertions(+), 9 deletions(-) (limited to 'moonclient') diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json index d2ca0e2a..1b17cc28 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json +++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json @@ -21,6 +21,48 @@ "result": "", "description": "Upload the Cirros image in glance" }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default tcp 22 22 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create router", + "external_command": "neutron router-create demo-router", + "result": "", + "description": "Create a new router" + }, + { + "name": "set router", + "external_command": "neutron router-gateway-set demo-router ext-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron net-create demo-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron subnet-create demo-net 192.168.1.0/24 --name demo-subnet --gateway 192.168.1.1", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron router-interface-add demo-router demo-subnet", + "result": "", + "description": "Configure the new router" + }, { "name": "openstack image list", "external_command": "nova image-list", @@ -30,8 +72,8 @@ { "name": "create tenant test", "external_command": "openstack project create test_moonclient", - "result": "(?P[\\w-]+)\\s+\\| cirros", - "description": "Get an Image ID" + "result": "", + "description": "Create a new tenant" }, { "name": "add role admin to demo", @@ -42,13 +84,13 @@ { "name": "neutron net-list", "external_command": "neutron net-list", - "result": "(?P[\\w-]+)\\s+\\| ext-net", + "result": "(?P[\\w-]+)\\s+\\| demo-net", "description": "Get an Net ID" }, { "name": "nova boot new server", - "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", - "result": "(?P[\\w-]+)\\s+\\| cirros-0.", + "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net --security-group default test_moonclient", + "result": "", "description": "Get an Image ID" }, { diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json index de266d31..399710be 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_nova.json +++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json @@ -19,6 +19,48 @@ "result": "", "description": "Upload the Cirros image in glance" }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default tcp 22 22 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create router", + "external_command": "neutron router-create demo-router", + "result": "", + "description": "Create a new router" + }, + { + "name": "set router", + "external_command": "neutron router-gateway-set demo-router ext-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron net-create demo-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron subnet-create demo-net 192.168.1.0/24 --name demo-subnet --gateway 192.168.1.1", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron router-interface-add demo-router demo-subnet", + "result": "", + "description": "Configure the new router" + }, { "name": "nova image-list", "external_command": "nova image-list", @@ -33,8 +75,8 @@ }, { "name": "nova boot new server", - "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", - "result": "(?P[\\w-]+)\\s+\\| cirros", + "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net --security-group default test_moonclient", + "result": "", "description": "Get an Image ID" }, { diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json index 25993dd0..4caa0df1 100644 --- a/moonclient/moonclient/tests/tests_external_commands.json +++ b/moonclient/moonclient/tests/tests_external_commands.json @@ -129,6 +129,48 @@ "result": "", "description": "Upload the Cirros image in glance" }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default icmp -1 -1 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create secgroup", + "external_command": "nova secgroup-add-rule default tcp 22 22 0.0.0.0/0", + "result": "", + "description": "Create a new secgroup in Nova" + }, + { + "name": "create router", + "external_command": "neutron router-create demo-router", + "result": "", + "description": "Create a new router" + }, + { + "name": "set router", + "external_command": "neutron router-gateway-set demo-router ext-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron net-create demo-net", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron subnet-create demo-net 192.168.1.0/24 --name demo-subnet --gateway 192.168.1.1", + "result": "", + "description": "Configure the new router" + }, + { + "name": "set router", + "external_command": "neutron router-interface-add demo-router demo-subnet", + "result": "", + "description": "Configure the new router" + }, { "name": "nova image-list", "external_command": "nova image-list", @@ -143,8 +185,8 @@ }, { "name": "nova boot new server", - "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", - "result": "(?P[\\w-]+)\\s+\\| cirros", + "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net --security-group default test_moonclient", + "result": "", "description": "Get an Image ID" }, { -- cgit