Fix an issue when executing all tests at the same time.

Change-Id: I1215c6e005438f19f042a4296fcaf156ea7d0ffe

diff --git a/moonclient/moonclient/tests/tests_action_assignments.json b/moonclient/moonclient/tests/tests_action_assignments.json
index 4ce5833..f5cabbb 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_assignments.json
+++ b/moonclient/moonclient/tests/tests_action_assignments.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_action_categories.json b/moonclient/moonclient/tests/tests_action_categories.json
index d748570..1932ffc 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_categories.json
+++ b/moonclient/moonclient/tests/tests_action_categories.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_action_scopes.json b/moonclient/moonclient/tests/tests_action_scopes.json
index 2dd26c6..069af73 100644 (file)
--- a/moonclient/moonclient/tests/tests_action_scopes.json
+++ b/moonclient/moonclient/tests/tests_action_scopes.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_actions.json b/moonclient/moonclient/tests/tests_actions.json
index f512a91..07de9cc 100644 (file)
--- a/moonclient/moonclient/tests/tests_actions.json
+++ b/moonclient/moonclient/tests/tests_actions.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_admin_intraextensions.json b/moonclient/moonclient/tests/tests_admin_intraextensions.json
index 5d3fa92..16a4734 100644 (file)
--- a/moonclient/moonclient/tests/tests_admin_intraextensions.json
+++ b/moonclient/moonclient/tests/tests_admin_intraextensions.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "main": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_configuration.json b/moonclient/moonclient/tests/tests_configuration.json
index 3ad327c..de16ec9 100644 (file)
--- a/moonclient/moonclient/tests/tests_configuration.json
+++ b/moonclient/moonclient/tests/tests_configuration.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_empty_policy_new_user.json b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
index 3e03fdf..7c1d08c 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_new_user.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_new_user.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "nova image-list",
         "external_command": "nova image-list",
@@ -3276,6 +3281,62 @@
         "description": "Check that the rule was correctly added.",
         "command_options": "-c id -c s:role -c a:action_id -c o:object_id -f value"
       },
+      {
+        "name": "add_a_new_rule",
+        "command": "rule add $submetarule_uuid_admin \"demo_role,read,authz_object_scopes\"",
+        "result": "^$",
+        "description": "Add a new rule.",
+        "command_options": ""
+      },
+      {
+        "name": "check_added_rule",
+        "command": "rule list $submetarule_uuid_admin",
+        "result": "(?P<rule_id>\\w+)\\s+demo_role\\s+read\\s+authz_object_scopes",
+        "description": "Check that the rule was correctly added.",
+        "command_options": "-c id -c s:role -c a:action_id -c o:object_id -f value"
+      },
+      {
+        "name": "add_a_new_rule",
+        "command": "rule add $submetarule_uuid_admin \"demo_role,write,authz_object_scopes\"",
+        "result": "^$",
+        "description": "Add a new rule.",
+        "command_options": ""
+      },
+      {
+        "name": "check_added_rule",
+        "command": "rule list $submetarule_uuid_admin",
+        "result": "(?P<rule_id>\\w+)\\s+demo_role\\s+write\\s+authz_object_scopes",
+        "description": "Check that the rule was correctly added.",
+        "command_options": "-c id -c s:role -c a:action_id -c o:object_id -f value"
+      },
+      {
+        "name": "add_a_new_rule",
+        "command": "rule add $submetarule_uuid_admin \"demo_role,read,authz_object_categories\"",
+        "result": "^$",
+        "description": "Add a new rule.",
+        "command_options": ""
+      },
+      {
+        "name": "check_added_rule",
+        "command": "rule list $submetarule_uuid_admin",
+        "result": "(?P<rule_id>\\w+)\\s+demo_role\\s+read\\s+authz_object_categories",
+        "description": "Check that the rule was correctly added.",
+        "command_options": "-c id -c s:role -c a:action_id -c o:object_id -f value"
+      },
+      {
+        "name": "add_a_new_rule",
+        "command": "rule add $submetarule_uuid_admin \"demo_role,write,authz_object_categories\"",
+        "result": "^$",
+        "description": "Add a new rule.",
+        "command_options": ""
+      },
+      {
+        "name": "check_added_rule",
+        "command": "rule list $submetarule_uuid_admin",
+        "result": "(?P<rule_id>\\w+)\\s+demo_role\\s+write\\s+authz_object_categories",
+        "description": "Check that the rule was correctly added.",
+        "command_options": "-c id -c s:role -c a:action_id -c o:object_id -f value"
+      },
 
       {
         "name": "select_authz_ie",
@@ -3446,6 +3507,11 @@
       },
 
 
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin"
+      },
+
       {
         "name": "delete_authz_intra_extension",
         "command": "intraextension delete $uuid_authz",
@@ -3453,6 +3519,13 @@
         "description": "Delete the authz intra extension",
         "command_options": ""
       },
+      {
+        "name": "delete_admin_intra_extension",
+        "command": "intraextension delete $uuid_admin",
+        "result": "",
+        "description": "Delete the admin intra extension",
+        "command_options": ""
+      },
       {
         "name": "delete_tenant",
         "command": "tenant delete $uuid",

diff --git a/moonclient/moonclient/tests/tests_empty_policy_nova.json b/moonclient/moonclient/tests/tests_empty_policy_nova.json
index 6348221..fdab951 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_nova.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_nova.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "nova image-list",
         "external_command": "nova image-list",
@@ -45,6 +50,20 @@
         "result": "(?P<uuid>\\w+)\\s+demo",
         "description": "Check that tenant demo has been correctly added"
       },
+
+      {
+        "name": "check nova command",
+        "external_command": "nova list",
+        "no_result": "test_moonclient",
+        "description": "Check that we cannot list nova servers due to the current rules"
+      },
+      {
+        "name": "try to pause nova instance",
+        "external_command": "nova pause $uuid_server",
+        "result": "^$",
+        "description": "Pausing the server must be impossible due to the current rules"
+      },
+
       {
         "name": "create_intraextension_authz",
         "command": "intraextension add --policy_model policy_empty_authz empty_test",
@@ -873,19 +892,6 @@
         "command_options": ""
       },
 
-      {
-        "name": "check nova command",
-        "external_command": "nova list",
-        "no_result": "test_moonclient",
-        "description": "Check that we cannot list nova servers due to the current rules"
-      },
-      {
-        "name": "try to pause nova instance",
-        "external_command": "nova pause $uuid_server",
-        "result": "^$",
-        "description": "Pausing the server must be impossible due to the current rules"
-      },
-
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_empty_policy_swift.json b/moonclient/moonclient/tests/tests_empty_policy_swift.json
index a1c197c..5ee1833 100644 (file)
--- a/moonclient/moonclient/tests/tests_empty_policy_swift.json
+++ b/moonclient/moonclient/tests/tests_empty_policy_swift.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "swift list",
         "external_command": "swift list",

diff --git a/moonclient/moonclient/tests/tests_external_commands.json b/moonclient/moonclient/tests/tests_external_commands.json
index 0b212e9..b01fde2 100644 (file)
--- a/moonclient/moonclient/tests/tests_external_commands.json
+++ b/moonclient/moonclient/tests/tests_external_commands.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "main": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_object_assignments.json b/moonclient/moonclient/tests/tests_object_assignments.json
index fa834cc..3ae555c 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_assignments.json
+++ b/moonclient/moonclient/tests/tests_object_assignments.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_object_categories.json b/moonclient/moonclient/tests/tests_object_categories.json
index a8a8011..ac067a8 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_categories.json
+++ b/moonclient/moonclient/tests/tests_object_categories.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_object_scopes.json b/moonclient/moonclient/tests/tests_object_scopes.json
index b97636b..52ac12f 100644 (file)
--- a/moonclient/moonclient/tests/tests_object_scopes.json
+++ b/moonclient/moonclient/tests/tests_object_scopes.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_objects.json b/moonclient/moonclient/tests/tests_objects.json
index 10481d3..ef17dd6 100644 (file)
--- a/moonclient/moonclient/tests/tests_objects.json
+++ b/moonclient/moonclient/tests/tests_objects.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_root_intraextensions.json b/moonclient/moonclient/tests/tests_root_intraextensions.json
index 339136d..e24151d 100644 (file)
--- a/moonclient/moonclient/tests/tests_root_intraextensions.json
+++ b/moonclient/moonclient/tests/tests_root_intraextensions.json
@@ -2,6 +2,10 @@
   "command_options": "-f value",
   "tests_group": {
     "main": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
 
       {
         "name": "list_intraextension",

diff --git a/moonclient/moonclient/tests/tests_rules.json b/moonclient/moonclient/tests/tests_rules.json
index 6c22073..1950a1e 100644 (file)
--- a/moonclient/moonclient/tests/tests_rules.json
+++ b/moonclient/moonclient/tests/tests_rules.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_subject_assignments.json b/moonclient/moonclient/tests/tests_subject_assignments.json
index d038c2c..e91f122 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_assignments.json
+++ b/moonclient/moonclient/tests/tests_subject_assignments.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_subject_categories.json b/moonclient/moonclient/tests/tests_subject_categories.json
index 54540f0..cd2be2d 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_categories.json
+++ b/moonclient/moonclient/tests/tests_subject_categories.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_subject_scopes.json b/moonclient/moonclient/tests/tests_subject_scopes.json
index 218038c..bbf31c1 100644 (file)
--- a/moonclient/moonclient/tests/tests_subject_scopes.json
+++ b/moonclient/moonclient/tests/tests_subject_scopes.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_subjects.json b/moonclient/moonclient/tests/tests_subjects.json
index db79367..5543372 100644 (file)
--- a/moonclient/moonclient/tests/tests_subjects.json
+++ b/moonclient/moonclient/tests/tests_subjects.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_submetarules.json b/moonclient/moonclient/tests/tests_submetarules.json
index d8b3e4d..cde01c2 100644 (file)
--- a/moonclient/moonclient/tests/tests_submetarules.json
+++ b/moonclient/moonclient/tests/tests_submetarules.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "authz": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",

diff --git a/moonclient/moonclient/tests/tests_tenants.json b/moonclient/moonclient/tests/tests_tenants.json
index c2674db..719cdbf 100644 (file)
--- a/moonclient/moonclient/tests/tests_tenants.json
+++ b/moonclient/moonclient/tests/tests_tenants.json
@@ -2,6 +2,11 @@
   "command_options": "-f value",
   "tests_group": {
     "main": [
+      {
+        "auth_name": "admin",
+        "description": "Change user to admin (just in case...)"
+      },
+
       {
         "name": "list tenant",
         "command": "tenant list",