From 14d8869f1f1fb3b9fd24c9580afa483bacd8e806 Mon Sep 17 00:00:00 2001
From: lpiwowar <lpiwowar@redhat.com>
Date: Thu, 15 Jul 2021 11:37:38 +0200
Subject: [PATCH] Add new network capabilities as advisory

Based on our analysis [1], there were several network tests
available which weren't included in any interop guideline.
This commit adds those tests under a few new capabilities which
are added as advisory for now. They can be moved to required
after one cycle being under advisory. Interop WG will review
these tests for inclusion for the next guideline cycle.

[1] https://etherpad.opendev.org/p/refstack-test-analysis

Change-Id: I5a044ebf06d62988a6e69fe458ef7f3193cc84d8
---
 guidelines/next.json               | 54 +++++++++++++++++++++++++++++-
 tools/cross_check/exclude_file.txt | 10 ++++++
 2 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/guidelines/next.json b/guidelines/next.json
index 1c702b22..ce31a30b 100644
--- a/guidelines/next.json
+++ b/guidelines/next.json
@@ -172,7 +172,8 @@
           "compute-images-metadata-get",
           "compute-images-metadata-list",
           "compute-images-metadata-set",
-          "compute-images-metadata-update"
+          "compute-images-metadata-update",
+          "networks-security-groups-CRUD-2"
         ],
         "deprecated": [],
         "removed": []
@@ -2506,6 +2507,57 @@
         }
       }
     },
+    "networks-security-groups-CRUD-2": {
+      "achievements": [
+          "foundation",
+          "complete",
+          "doc",
+          "proximity",
+          "clients",
+          "discover",
+          "future",
+          "atomic",
+          "stable",
+          "tools",
+          "deployed"
+      ],
+      "admin": false,
+      "description": "Basic CRUD operations on security groups",
+      "project": "neutron",
+      "required_since": "2021.07",
+      "tests": {
+        "tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_list_security_groups_by_server": {
+          "idempotent_id": "id-79517d60-535a-438f-af3d-e6feab1cbea7"
+        },
+        "tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_group_create_get_delete": {
+          "idempotent_id": "id-ecc0da4a-2117-48af-91af-993cca39a615"
+        },
+        "tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_security_groups_create_list_delete": {
+          "idempotent_id": "id-eb2b087d-633d-4d0d-a7bd-9e6ba35b32de"
+        },
+        "tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_server_security_groups": {
+          "idempotent_id": "id-fe4abc0d-83f5-4c50-ad11-57a1127297a2"
+        },
+        "tempest.api.compute.security_groups.test_security_groups.SecurityGroupsTestJSON.test_update_security_groups": {
+          "idempotent_id": "id-7d4e1d3c-3209-4d6d-b020-986304ebad1f"
+        },
+        "tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_delete_nonexistent_security_group": {
+          "idempotent_id": "id-6727c00b-214c-4f9e-9a52-017ac3e98411"
+        },
+        "tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_delete_security_group_without_passing_id": {
+          "idempotent_id": "id-1438f330-8fa4-4aeb-8a94-37c250106d7f"
+        },
+        "tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_delete_the_default_security_group": {
+          "idempotent_id": "id-36a1629f-c6da-4a26-b8b8-55e7e5d5cd58"
+        },
+        "tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_get_nonexistent_group": {
+          "idempotent_id": "id-673eaec1-9b3e-48ed-bdf1-2786c1b9661c"
+        },
+        "tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_non_existent_security_group": {
+          "idempotent_id": "id-27edee9c-873d-4da6-a68a-3c256efebe8f"
+        }
+      }
+    },
     "networks-security-groups-CRUD": {
       "achievements": [
           "foundation",
diff --git a/tools/cross_check/exclude_file.txt b/tools/cross_check/exclude_file.txt
index fe7a91bb..7802a56e 100644
--- a/tools/cross_check/exclude_file.txt
+++ b/tools/cross_check/exclude_file.txt
@@ -18,3 +18,13 @@ tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSO
 tempest.api.compute.floating_ips.test_list_floating_ips.FloatingIPDetailsTestJSON.test_list_floating_ips
 tempest.api.compute.floating_ips.test_list_floating_ips_negative.FloatingIPDetailsNegativeTestJSON.test_get_nonexistent_floating_ip_details
 
+# These tests are always skipped if neutron service is enabled.
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_create_with_duplicate_name
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_des
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_id
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_update_security_group_with_invalid_sg_name
+
+# These two tests are skipped due to this bug https://launchpad.net/bugs/1161411
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_create_with_invalid_group_description
+tempest.api.compute.security_groups.test_security_groups_negative.SecurityGroupsNegativeTestJSON.test_security_group_create_with_invalid_group_name
+