Merge "Network tag support"

Author: Jenkins

doc/source/cli/command-objects/network.rst

@@ -32,6 +32,7 @@ Create new network
         [--provider-segment <provider-segment>]
         [--qos-policy <qos-policy>]
         [--transparent-vlan | --no-transparent-vlan]
+        [--tag <tag> | --no-tag]
         <name>
 
 .. option:: --project <project>
@@ -165,6 +166,18 @@ Create new network
 
     *Network version 2 only*
 
+.. option:: --tag <tag>
+
+    Tag to be added to the network (repeat option to set multiple tags)
+
+    *Network version 2 only*
+
+.. option:: --no-tag
+
+    No tags associated with the network
+
+    *Network version 2 only*
+
 .. _network_create-name:
 .. describe:: <name>
 
@@ -206,6 +219,8 @@ List networks
         [--provider-physical-network <provider-physical-network>]
         [--provider-segment <provider-segment>]
         [--agent <agent-id>]
+        [--tags <tag>[,<tag>,...]] [--any-tags <tag>[,<tag>,...]]
+        [--not-tags <tag>[,<tag>,...]] [--not-any-tags <tag>[,<tag>,...]]
 
 .. option:: --external
 
@@ -297,6 +312,32 @@ List networks
 
     List networks hosted by agent (ID only)
 
+    *Network version 2 only*
+
+.. option:: --tags <tag>[,<tag>,...]
+
+    List networks which have all given tag(s)
+
+    *Network version 2 only*
+
+.. option:: --any-tags <tag>[,<tag>,...]
+
+    List networks which have any given tag(s)
+
+    *Network version 2 only*
+
+.. option:: --not-tags <tag>[,<tag>,...]
+
+    Exclude networks which have all given tag(s)
+
+    *Network version 2 only*
+
+.. option:: --not-any-tags <tag>[,<tag>,...]
+
+    Exclude networks which have any given tag(s)
+
+    *Network version 2 only*
+
 network set
 -----------
 
@@ -318,6 +359,7 @@ Set network properties
         [--provider-physical-network <provider-physical-network>]
         [--provider-segment <provider-segment>]
         [--qos-policy <qos-policy> | --no-qos-policy]
+        [--tag <tag>] [--no-tag]
         <network>
 
 .. option:: --name <name>
@@ -392,6 +434,15 @@ Set network properties
 
     Remove the QoS policy attached to this network
 
+.. option:: --tag <tag>
+
+    Tag to be added to the network (repeat option to set multiple tags)
+
+.. option:: --no-tag
+
+    Clear tags associated with the network. Specify both --tag
+    and --no-tag to overwrite current tags
+
 .. _network_set-network:
 .. describe:: <network>
 
@@ -412,3 +463,31 @@ Display network details
 .. describe:: <network>
 
     Network to display (name or ID)
+
+network unset
+-------------
+
+Unset network properties
+
+*Network version 2 only*
+
+.. program:: network unset
+.. code:: bash
+
+    openstack network unset
+        [--tag <tag> | --all-tag]
+        <network>
+
+.. option:: --tag <tag>
+
+    Tag to be removed from the network
+    (repeat option to remove multiple tags)
+
+.. option:: --all-tag
+
+    Clear all tags associated with the network
+
+.. _network_unset-network:
+.. describe:: <network>
+
+    Network to modify (name or ID)

doc/source/cli/command-objects/port.rst

@@ -33,6 +33,7 @@ Create new port
         [--qos-policy <qos-policy>]
         [--project <project> [--project-domain <project-domain>]]
         [--enable-port-security | --disable-port-security]
+        [--tag <tag> | --no-tag]
         <name>
 
 .. option:: --network <network>
@@ -126,6 +127,14 @@ Create new port
 
     Disable port security for this port
 
+.. option:: --tag <tag>
+
+    Tag to be added to the port (repeat option to set multiple tags)
+
+.. option:: --no-tag
+
+    No tags associated with the port
+
 .. _port_create-name:
 .. describe:: <name>
 
@@ -163,6 +172,8 @@ List ports
         [--fixed-ip subnet=<subnet>,ip-address=<ip-address>]
         [--long]
         [--project <project> [--project-domain <project-domain>]]
+        [--tags <tag>[,<tag>,...]] [--any-tags <tag>[,<tag>,...]]
+        [--not-tags <tag>[,<tag>,...]] [--not-any-tags <tag>[,<tag>,...]]
 
 .. option:: --device-owner <device-owner>
 
@@ -204,6 +215,22 @@ List ports
     Domain the project belongs to (name or ID).
     This can be used in case collisions between project names exist.
 
+.. option:: --tags <tag>[,<tag>,...]
+
+    List ports which have all given tag(s)
+
+.. option:: --any-tags <tag>[,<tag>,...]
+
+    List ports which have any given tag(s)
+
+.. option:: --not-tags <tag>[,<tag>,...]
+
+    Exclude ports which have all given tag(s)
+
+.. option:: --not-any-tags <tag>[,<tag>,...]
+
+    Exclude ports which have any given tag(s)
+
 port set
 --------
 
@@ -233,6 +260,7 @@ Set port properties
         [--allowed-address ip-address=<ip-address>[,mac-address=<mac-address>]]
         [--no-allowed-address]
         [--data-plane-status <status>]
+        [--tag <tag>] [--no-tag]
         <port>
 
 .. option:: --description <description>
@@ -342,6 +370,15 @@ Set port properties
     Unset it to None with the 'port unset' command
     (requires data plane status extension)
 
+.. option:: --tag <tag>
+
+    Tag to be added to the port (repeat option to set multiple tags)
+
+.. option:: --no-tag
+
+    Clear tags associated with the port. Specify both --tag
+    and --no-tag to overwrite current tags
+
 .. _port_set-port:
 .. describe:: <port>
 
@@ -378,6 +415,7 @@ Unset port properties
         [--allowed-address ip-address=<ip-address>[,mac-address=<mac-address>] [...]]
         [--qos-policy]
         [--data-plane-status]
+        [--tag <tag> | --all-tag]
         <port>
 
 .. option:: --fixed-ip subnet=<subnet>,ip-address=<ip-address>
@@ -410,6 +448,15 @@ Unset port properties
 
     Clear existing information of data plane status
 
+.. option:: --tag <tag>
+
+    Tag to be removed from the port
+    (repeat option to remove multiple tags)
+
+.. option:: --all-tag
+
+    Clear all tags associated with the port
+
 .. _port_unset-port:
 .. describe:: <port>
 

doc/source/cli/command-objects/router.rst

@@ -67,6 +67,7 @@ Create new router
         [--ha | --no-ha]
         [--description <description>]
         [--availability-zone-hint <availability-zone>]
+        [--tag <tag> | --no-tag]
         <name>
 
 .. option:: --project <project>
@@ -121,6 +122,14 @@ Create new router
     (Router Availability Zone extension required,
     repeat option to set multiple availability zones)
 
+.. option:: --tag <tag>
+
+    Tag to be added to the router (repeat option to set multiple tags)
+
+.. option:: --no-tag
+
+    No tags associated with the router
+
 .. _router_create-name:
 .. describe:: <name>
 
@@ -156,6 +165,8 @@ List routers
         [--long]
         [--project <project> [--project-domain <project-domain>]]
         [--agent <agent-id>]
+        [--tags <tag>[,<tag>,...]] [--any-tags <tag>[,<tag>,...]]
+        [--not-tags <tag>[,<tag>,...]] [--not-any-tags <tag>[,<tag>,...]]
 
 .. option:: --agent <agent-id>
 
@@ -186,6 +197,22 @@ List routers
     Domain the project belongs to (name or ID).
     This can be used in case collisions between project names exist.
 
+.. option:: --tags <tag>[,<tag>,...]
+
+    List routers which have all given tag(s)
+
+.. option:: --any-tags <tag>[,<tag>,...]
+
+    List routers which have any given tag(s)
+
+.. option:: --not-tags <tag>[,<tag>,...]
+
+    Exclude routers which have all given tag(s)
+
+.. option:: --not-any-tags <tag>[,<tag>,...]
+
+    Exclude routers which have any given tag(s)
+
 router remove port
 ------------------
 
@@ -246,6 +273,7 @@ Set router properties
         [--route destination=<subnet>,gateway=<ip-address> | --no-route]
         [--ha | --no-ha]
         [--external-gateway <network> [--enable-snat|--disable-snat] [--fixed-ip subnet=<subnet>,ip-address=<ip-address>]]
+        [--tag <tag>] [--no-tag]
         <router>
 
 .. option:: --name <name>
@@ -311,6 +339,15 @@ Set router properties
     subnet=<subnet>,ip-address=<ip-address>
     (repeat option to set multiple fixed IP addresses)
 
+.. option:: --tag <tag>
+
+    Tag to be added to the router (repeat option to set multiple tags)
+
+.. option:: --no-tag
+
+    Clear tags associated with the router. Specify both --tag
+    and --no-tag to overwrite current tags
+
 .. _router_set-router:
 .. describe:: <router>
 
@@ -343,6 +380,7 @@ Unset router properties
     openstack router unset
         [--route destination=<subnet>,gateway=<ip-address>]
         [--external-gateway]
+        [--tag <tag> | --all-tag]
         <router>
 
 .. option:: --route destination=<subnet>,gateway=<ip-address>
@@ -356,6 +394,15 @@ Unset router properties
 
     Remove external gateway information from the router
 
+.. option:: --tag <tag>
+
+    Tag to be removed from the router
+    (repeat option to remove multiple tags)
+
+.. option:: --all-tag
+
+    Clear all tags associated with the router
+
 .. _router_unset-router:
 .. describe:: <router>