Show user network ID for getting instance

Change-Id: Ia1e9112ae69e04f8c3e9e9d1b4a0189c743d7448

3 files changed, 63 insertions, 63 deletions

diff --git a/doc/source/user/create-db.rst b/doc/source/user/create-db.rst
index a8a111e1..01065446 100644
--- a/doc/source/user/create-db.rst
+++ b/doc/source/user/create-db.rst
@@ -91,28 +91,28 @@ Create and access a database instance
    .. code-block:: console
 
       $ openstack database instance show ad40cf6c-6532-4a22-a3f3-7364f0f04a0f
-      +--------------------------+----------------------------------------------------------------------------------------------+
-      | Field                    | Value                                                                                        |
-      +--------------------------+----------------------------------------------------------------------------------------------+
-      | addresses                | [{'address': '10.0.0.59', 'type': 'private'}, {'address': '172.24.4.242', 'type': 'public'}] |
-      | allowed_cidrs            | []                                                                                           |
-      | created                  | 2020-12-08T21:00:20                                                                          |
-      | datastore                | mysql                                                                                        |
-      | datastore_version        | 5.7.29                                                                                       |
-      | datastore_version_number | 5.7.29                                                                                       |
-      | flavor                   | 1fb05bb0-4605-48b6-81e6-3d4622e4a330                                                         |
-      | id                       | ad40cf6c-6532-4a22-a3f3-7364f0f04a0f                                                         |
-      | ip                       | 10.0.0.59, 172.24.4.242                                                                      |
-      | name                     | mysql_instance_1                                                                             |
-      | operating_status         | HEALTHY                                                                                      |
-      | public                   | True                                                                                         |
-      | region                   | RegionOne                                                                                    |
-      | service_status_updated   | 2020-12-08T21:05:51                                                                          |
-      | status                   | ACTIVE                                                                                       |
-      | updated                  | 2020-12-08T21:04:39                                                                          |
-      | volume                   | 5                                                                                            |
-      | volume_used              | 0.2                                                                                          |
-      +--------------------------+----------------------------------------------------------------------------------------------+
+      +--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
+      | Field                    | Value                                                                                                                                           |
+      +--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
+      | addresses                | [{'address': '10.0.0.59', 'type': 'private', 'network': '09f6aadc-f92d-41d4-8cad-2eb1876054dd'}, {'address': '172.24.4.242', 'type': 'public'}] |
+      | allowed_cidrs            | []                                                                                                                                              |
+      | created                  | 2020-12-08T21:00:20                                                                                                                             |
+      | datastore                | mysql                                                                                                                                           |
+      | datastore_version        | 5.7.29                                                                                                                                          |
+      | datastore_version_number | 5.7.29                                                                                                                                          |
+      | flavor                   | 1fb05bb0-4605-48b6-81e6-3d4622e4a330                                                                                                            |
+      | id                       | ad40cf6c-6532-4a22-a3f3-7364f0f04a0f                                                                                                            |
+      | ip                       | 10.0.0.59, 172.24.4.242                                                                                                                         |
+      | name                     | mysql_instance_1                                                                                                                                |
+      | operating_status         | HEALTHY                                                                                                                                         |
+      | public                   | True                                                                                                                                            |
+      | region                   | RegionOne                                                                                                                                       |
+      | service_status_updated   | 2020-12-08T21:05:51                                                                                                                             |
+      | status                   | ACTIVE                                                                                                                                          |
+      | updated                  | 2020-12-08T21:04:39                                                                                                                             |
+      | volume                   | 5                                                                                                                                               |
+      | volume_used              | 0.2                                                                                                                                             |
+      +--------------------------+-------------------------------------------------------------------------------------------------------------------------------------------------+
 
 #. **Access the new database**
 
diff --git a/doc/source/user/set-up-replication.rst b/doc/source/user/set-up-replication.rst
index ae0b3675..7ecb2f08 100644
--- a/doc/source/user/set-up-replication.rst
+++ b/doc/source/user/set-up-replication.rst
@@ -47,13 +47,13 @@ Set up replication
 
    .. code-block:: console
 
-      $ openstack database instance list
-      +--------------------------------------+----------------------+-----------+-------------------+---------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name                 | Datastore | Datastore Version | Status  | Operating Status | Addresses                                      | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+----------------------+-----------+-------------------+---------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | mysql     | 5.7.29            | ACTIVE  | HEALTHY          | [{'address': '10.1.0.155', 'type': 'private'}] | d2        |    2 | RegionOne | replica |
-      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | mysql     | 5.7.29            | ACTIVE  | HEALTHY          | [{'address': '10.1.0.43', 'type': 'private'}]  | d2        |    2 | RegionOne | primary |
-      +--------------------------------------+----------------------+-----------+-------------------+---------+------------------+-----------------------------+-----------+------+-----------+---------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status" -c Role
+      +--------------------------------------+----------------------+---------+------------------+---------+
+      | ID                                   | Name                 | Status  | Operating Status | Role    |
+      +--------------------------------------+----------------------+---------+------------------+---------+
+      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | ACTIVE  | HEALTHY          | replica |
+      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | ACTIVE  | HEALTHY          | primary |
+      +--------------------------------------+----------------------+---------+------------------+---------+
 
 #. Verify replication status.
 
@@ -119,14 +119,14 @@ couple minutes.
 
    .. code-block:: console
 
-      $ openstack database instance list
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name                 | Datastore | Datastore Version | Status | Operating Status | Addresses                                      | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.155', 'type': 'private'}] | d2        |    2 | RegionOne | replica |
-      | a85ece86-9f62-4aa8-bb15-eba604cd2a01 | test-mysql-replica-2 | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.243', 'type': 'private'}] | d2        |    2 | RegionOne | replica |
-      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.43', 'type': 'private'}]  | d2        |    2 | RegionOne | primary |
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+-----------------------------+-----------+------+-----------+---------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status" -c Role
+      +--------------------------------------+----------------------+--------+------------------+---------+
+      | ID                                   | Name                 | Status | Operating Status | Role    |
+      +--------------------------------------+----------------------+--------+------------------+---------+
+      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | ACTIVE | HEALTHY          | replica |
+      | a85ece86-9f62-4aa8-bb15-eba604cd2a01 | test-mysql-replica-2 | ACTIVE | HEALTHY          | replica |
+      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | ACTIVE | HEALTHY          | primary |
+      +--------------------------------------+----------------------+--------+------------------+---------+
 
 #. Failover(promote) "test-mysql-replica-1" to primary.
 
@@ -138,14 +138,14 @@ couple minutes.
 
    .. code-block:: console
 
-      $ openstack database instance list
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name                 | Datastore | Datastore Version | Status | Operating Status | Addresses                                      | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+------------------------------------------------+-----------+------+-----------+---------+
-      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.155', 'type': 'private'}] | d2        |    2 | RegionOne | primary |
-      | a85ece86-9f62-4aa8-bb15-eba604cd2a01 | test-mysql-replica-2 | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.243', 'type': 'private'}] | d2        |    2 | RegionOne | replica |
-      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.1.0.43', 'type': 'private'}]  | d2        |    2 | RegionOne | replica |
-      +--------------------------------------+----------------------+-----------+-------------------+--------+------------------+------------------------------------------------+-----------+------+-----------+---------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status" -c Role
+      +--------------------------------------+----------------------+--------+------------------+---------+
+      | ID                                   | Name                 | Status | Operating Status | Role    |
+      +--------------------------------------+----------------------+--------+------------------+---------+
+      | 71f30a72-4e47-4505-9e7f-ffd8933a331c | test-mysql-replica-1 | ACTIVE | HEALTHY          | primary |
+      | a85ece86-9f62-4aa8-bb15-eba604cd2a01 | test-mysql-replica-2 | ACTIVE | HEALTHY          | replica |
+      | cebbf187-e223-46dd-8802-6dc04e895d0a | test-mysql           | ACTIVE | HEALTHY          | replica |
+      +--------------------------------------+----------------------+--------+------------------+---------+
 
 #. Point your application to the (former) replica.
 
diff --git a/doc/source/user/upgrade-datastore.rst b/doc/source/user/upgrade-datastore.rst
index cceff6d2..6478fac9 100644
--- a/doc/source/user/upgrade-datastore.rst
+++ b/doc/source/user/upgrade-datastore.rst
@@ -54,12 +54,12 @@ Upgrading datastore
         --nic net-id=$netid \
         --datastore mysql --datastore-version 5.7.29 \
         --databases testdb --users user:password
-      $ openstack database instance list
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name               | Datastore | Datastore Version | Status | Operating Status | Addresses                                     | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | mysql     | 5.7.29            | ACTIVE | HEALTHY          | [{'address': '10.0.0.54', 'type': 'private'}] | d2        |    1 | RegionOne |         |
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status" -c Addresses
+      +--------------------------------------+--------------------+--------+------------------+--------------------------------------------------------------------------------------------------+
+      | ID                                   | Name               | Status | Operating Status | Addresses                                                                                        |
+      +--------------------------------------+--------------------+--------+------------------+--------------------------------------------------------------------------------------------------+
+      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | ACTIVE | HEALTHY          | [{'address': '10.0.0.54', 'type': 'private', 'network': '3dc8f3c2-f335-11eb-878c-00224d6b7bc1'}] |
+      +--------------------------------------+--------------------+--------+------------------+--------------------------------------------------------------------------------------------------+
 
    Check the MySQL version by connecting with the database:
 
@@ -90,18 +90,18 @@ Upgrading datastore
 
    .. code-block:: console
 
-      $ openstack database instance list
-      +--------------------------------------+--------------------+-----------+-------------------+---------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name               | Datastore | Datastore Version | Status  | Operating Status | Addresses                                     | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+--------------------+-----------+-------------------+---------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | mysql     | 5.7.30            | UPGRADE |                  | [{'address': '10.0.0.54', 'type': 'private'}] | d2        |    1 | RegionOne |         |
-      +--------------------------------------+--------------------+-----------+-------------------+---------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      $ openstack database instance list
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | ID                                   | Name               | Datastore | Datastore Version | Status | Operating Status | Addresses                                     | Flavor ID | Size | Region    | Role    |
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
-      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | mysql     | 5.7.30            | ACTIVE | HEALTHY          | [{'address': '10.0.0.54', 'type': 'private'}] | d2        |    1 | RegionOne |         |
-      +--------------------------------------+--------------------+-----------+-------------------+--------+------------------+-----------------------------------------------+-----------+------+-----------+---------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status"
+      +--------------------------------------+--------------------+---------+------------------+
+      | ID                                   | Name               | Status  | Operating Status |
+      +--------------------------------------+--------------------+---------+------------------+
+      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | UPGRADE |                  |
+      +--------------------------------------+--------------------+---------+------------------+
+      $ openstack database instance list -c ID -c Name -c Status -c "Operating Status"
+      +--------------------------------------+--------------------+--------+------------------+
+      | ID                                   | Name               | Status | Operating Status |
+      +--------------------------------------+--------------------+--------+------------------+
+      | 32eb56b0-d10d-43e9-b59e-1e4b0979e5dd | test-mysql-upgrade | ACTIVE | HEALTHY          |
+      +--------------------------------------+--------------------+--------+------------------+
 
    Check the MySQL version again: