diff options
Diffstat (limited to 'moonclient/moonclient/tests')
3 files changed, 43 insertions, 13 deletions
diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json index 6caf34ee..2d24e02e 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json +++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json @@ -28,10 +28,16 @@ "description": "Force the admin role for the user demo on the project admin (for testing purpose)." }, { + "name": "neutron net-list", + "external_command": "neutron net-list", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "description": "Get an Net ID" + }, + { "name": "nova boot new server", - "external_command": "nova boot --flavor m1.tiny --image $uuid_image test_moonclient", - "result": "\\| OS-EXT-STS\\:vm_state\\s+\\| building", - "description": "Boot a new nova server." + "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "description": "Get an Image ID" }, { "name": "sleep", @@ -3398,12 +3404,6 @@ "result": "\\| (?P<uuid_server>[\\w\\-]+)\\s+\\| test_moonclient\\s+\\| ACTIVE\\s+\\| [\\w\\-]+\\s+\\| Running", "description": "Check that nova server is still in running state." }, - { - "name": "pause", - "external_command": "read", - "result": "", - "description": "Pause" - }, { "name": "list tenant", @@ -3564,4 +3564,4 @@ } ] } -}
\ No newline at end of file +} diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json index 521b1f1d..e1781c1f 100644 --- a/moonclient/moonclient/tests/tests_empty_policy_nova.json +++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json @@ -10,13 +10,19 @@ { "name": "nova image-list", "external_command": "nova image-list", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3.4-x86_64-uec", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.*", "description": "Get an Image ID" }, { + "name": "neutron net-list", + "external_command": "neutron net-list", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "description": "Get an Net ID" + }, + { "name": "nova boot new server", - "external_command": "nova boot --flavor m1.micro --image $uuid_image test_moonclient", - "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.3.4-x86_64-uec", + "external_command": "nova boot --flavor m1.tiny --image $uuid_image --nic net-id=$uuid_net test_moonclient", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", "description": "Get an Image ID" }, { diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json index bfb7ac1a..d94658cc 100644 --- a/moonclient/moonclient/tests/tests_external_commands.json +++ b/moonclient/moonclient/tests/tests_external_commands.json @@ -118,6 +118,30 @@ }, { + "name": "nova image-list", + "external_command": "nova image-list", + "result": "(?P<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "description": "Get an Image ID" + }, + { + "name": "neutron net-list", + "external_command": "neutron net-list", + "result": "(?P<uuid_net>[\\w-]+)\\s+\\| public", + "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<uuid_image>[\\w-]+)\\s+\\| cirros-0.", + "description": "Get an Image ID" + }, + { + "name": "sleep", + "external_command": "sleep 10", + "result": "", + "description": "time for server to really boot" + }, + { "name": "check nova command", "external_command": "nova list", "result": "\\| (?P<uuid_server>[\\w\\-]+)\\s+\\| (?P<name_server>\\w+)\\s+\\| ACTIVE\\s+\\| [\\w\\-]+\\s+\\| Running", |