From 61b9fd2310fe8b69c393c5768dcdc25f3d95ddd5 Mon Sep 17 00:00:00 2001
From: AbhishekJ <aj355y@att.com>
Date: Thu, 23 Jan 2020 15:10:39 +0000
Subject: [PATCH] Fixed test related to tag-ext

according to bug https://bugs.launchpad.net/neutron/+bug/1682775
tag-ext renamed to standard-attr-tag, after Stein release.
Related-Bug: #1682775

Change-Id: I6f16829a2430e428d80138d25137bd8263f9c15e
---
 tempest/api/network/test_tags.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tempest/api/network/test_tags.py b/tempest/api/network/test_tags.py
index 85f6896bef..2b9719af64 100644
--- a/tempest/api/network/test_tags.py
+++ b/tempest/api/network/test_tags.py
@@ -103,9 +103,10 @@ class TagsExtTest(base.BaseNetworkTest):
         List tags.
         Remove a tag.
 
-    v2.0 of the Neutron API is assumed. The tag-ext extension allows users to
-    set tags on the following resources: subnets, ports, routers and
-    subnetpools.
+    v2.0 of the Neutron API is assumed. The tag-ext or standard-attr-tag
+    extension allows users to set tags on the following resources: subnets,
+    ports, routers and subnetpools.
+    from stein release the tag-ext has been renamed to standard-attr-tag
     """
 
     # NOTE(felipemonteiro): The supported resource names are plural. Use
@@ -115,8 +116,12 @@ class TagsExtTest(base.BaseNetworkTest):
     @classmethod
     def skip_checks(cls):
         super(TagsExtTest, cls).skip_checks()
-        if not utils.is_extension_enabled('tag-ext', 'network'):
-            msg = "tag-ext extension not enabled."
+        # Added condition to support backward compatiblity since
+        # tag-ext has been renamed to standard-attr-tag
+        if not (utils.is_extension_enabled('tag-ext', 'network') or
+                utils.is_extension_enabled('standard-attr-tag', 'network')):
+            msg = ("neither tag-ext nor standard-attr-tag extensions "
+                   "are enabled.")
             raise cls.skipException(msg)
 
     @classmethod