Switch to using osc_lib.utils.tags

This patch updates the network modules to use the new
osc_lib.utils.tags module and removes the in tree _tag.py version.

A previous patch[1] moves the _tag.py code to osc-lib to allow other
projects to leverage the code.

[1] https://review.opendev.org/662859

Change-Id: Id0c34029e327de50c5fd2732bae5fbf45bbd16ee

Author: johnsom

lower-constraints.txt

@@ -54,7 +54,7 @@ openstacksdk==0.17.0
 os-client-config==1.28.0
 os-service-types==1.2.0
 os-testr==1.0.0
-osc-lib==1.14.0
+osc-lib==2.0.0
 osc-placement==1.7.0
 oslo.concurrency==3.26.0
 oslo.config==5.2.0

openstackclient/network/v2/_tag.py

@@ -16,12 +16,12 @@
 from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 _formatters = {

openstackclient/network/v2/floating_ip.py

@@ -17,12 +17,12 @@
 from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 class AdminStateColumn(cliff_columns.FormattableColumn):

openstackclient/network/v2/network.py

@@ -24,12 +24,12 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 LOG = logging.getLogger(__name__)

openstackclient/network/v2/port.py

@@ -23,11 +23,11 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 LOG = logging.getLogger(__name__)

openstackclient/network/v2/router.py

@@ -19,13 +19,13 @@
 from osc_lib.cli import format_columns
 from osc_lib.command import command
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
 from openstackclient.network import sdk_utils
 from openstackclient.network import utils as network_utils
-from openstackclient.network.v2 import _tag
 
 
 def _format_network_security_group_rules(sg_rules):

openstackclient/network/v2/security_group.py

@@ -22,11 +22,11 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 LOG = logging.getLogger(__name__)

openstackclient/network/v2/subnet.py

@@ -20,11 +20,11 @@
 from osc_lib.command import command
 from osc_lib import exceptions
 from osc_lib import utils
+from osc_lib.utils import tags as _tag
 
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import sdk_utils
-from openstackclient.network.v2 import _tag
 
 
 LOG = logging.getLogger(__name__)

openstackclient/network/v2/subnet_pool.py

@@ -8,7 +8,7 @@ Babel!=2.4.0,>=2.3.4 # BSD
 cliff!=2.9.0,>=2.8.0 # Apache-2.0
 keystoneauth1>=3.6.2 # Apache-2.0
 openstacksdk>=0.17.0 # Apache-2.0
-osc-lib>=1.14.0 # Apache-2.0
+osc-lib>=2.0.0 # Apache-2.0
 oslo.i18n>=3.15.3 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
 python-glanceclient>=2.8.0 # Apache-2.0