Merge ~rodrigo-barbieri2010/stsstack-bundles:demo_networks into stsstack-bundles:master

[Rodrigo Barbieri]

[Edward Hope-Morley (hopem)]

Hi Rodrigo, thanks for taking the time to look at this code. I think it might be better to add this as a new script/tool (i.e. under /tools) so that people can have an easy way to create arbitrary networks. I can see the benefit of having an extra network but personally i don't want to have one whenever i do a deployment and for debug and comparison purposes it actually helps me if the segmentation id is always the same (since if it changes it is yet another thing to identify). Also regarding moving router creation, I think the reason why router and network creation were kept in separate scripts was somewhat for this reason. Typically a tenant will have a one router with one or more networks attached. Maybe lets have a think about how we can make this work for everybody.

[Edward Hope-Morley (hopem)]

review: Needs Information

[Edward Hope-Morley (hopem)]

The repository has moved to https://github.com/canonical/stsstack-bundles/. Please resubmit there if you are still working on this patch.

Unmerged commits

a7d3b45... by Rodrigo Barbieri on 2020-07-06

Add demo tenant networks to configure

Also fixed bugs within the networks scripts
and refactored where necessary.

A few changes to note:
- moved user creation to before networks, so
  demo network could be created immediately after
  admin networks
- moved provider-router creation and setting gateway
  to same script that creates private networks,
  because routers are tenant-related.

diff --git a/openstack/bin/neutron-ext-net b/openstack/bin/neutron-ext-net
index 05e2133..0ba0ed8 100755
--- a/openstack/bin/neutron-ext-net
+++ b/openstack/bin/neutron-ext-net
@@ -151,26 +151,3 @@ if __name__ == '__main__':
         logging.warning('Subnet %s already exists.', subnet_name)
         subnet = subnets['subnets'][0]
 
-    routers = quantum.list_routers(name='provider-router')
-    if len(routers['routers']) == 0:
-        logging.info('Creating provider router for external network access')
-        router = quantum.create_router(
-            {'router': {'name': 'provider-router', 'tenant_id': tenant_id}}
-        )['router']
-        logging.info('New router created: %s', (router['id']))
-    else:
-        logging.warning('Router provider-router already exists.')
-        router = routers['routers'][0]
-
-    ports = quantum.list_ports(device_owner='network:router_gateway',
-                               network_id=network['id'])
-    if len(ports['ports']) == 0:
-        logging.info('Plugging router into ext_net')
-        router = \
-            quantum.add_gateway_router(
-                            router=router['id'],
-                            body={'network_id': network['id']}
-                            )
-        logging.info('Router connected to %s', net_name)
-    else:
-        logging.warning('Router already connect to %s', net_name)
diff --git a/openstack/bin/neutron-ext-net-ksv3 b/openstack/bin/neutron-ext-net-ksv3
index e647360..52627db 100755
--- a/openstack/bin/neutron-ext-net-ksv3
+++ b/openstack/bin/neutron-ext-net-ksv3
@@ -136,26 +136,3 @@ if __name__ == '__main__':
         logging.warning('Subnet %s already exists.', subnet_name)
         subnet = subnets['subnets'][0]
 
-    routers = quantum.list_routers(name='provider-router')
-    if len(routers['routers']) == 0:
-        logging.info('Creating provider router for external network access')
-        router = quantum.create_router(
-            {'router': {'name': 'provider-router', 'tenant_id': project_id}}
-        )['router']
-        logging.info('New router created: %s', (router['id']))
-    else:
-        logging.warning('Router provider-router already exists.')
-        router = routers['routers'][0]
-
-    ports = quantum.list_ports(device_owner='network:router_gateway',
-                               network_id=network['id'])
-    if len(ports['ports']) == 0:
-        logging.info('Plugging router into ext_net')
-        router = \
-            quantum.add_gateway_router(
-                            router=router['id'],
-                            body={'network_id': network['id']}
-                            )
-        logging.info('Router connected to %s', net_name)
-    else:
-        logging.warning('Router already connect to %s', net_name)
diff --git a/openstack/bin/neutron-tenant-net b/openstack/bin/neutron-tenant-net
index a2e5c13..9daa0ba 100755
--- a/openstack/bin/neutron-tenant-net
+++ b/openstack/bin/neutron-tenant-net
@@ -10,6 +10,7 @@ except ImportError:
 from keystoneclient.v2_0 import client as ks_client
 import optparse
 import os
+import random
 import sys
 import logging
 
@@ -100,10 +101,10 @@ if __name__ == '__main__':
         if opts.network_type == 'vxlan':
             network_msg['network']['provider:segmentation_id'] = 1233
         elif opts.network_type == 'vlan':
-            network_msg['network']['provider:segmentation_id'] = 5
+            network_msg['network']['provider:segmentation_id'] = random.randint(5, 1000)
             network_msg['network']['provider:physical_network'] = 'physnet1'
         else:
-            network_msg['network']['provider:segmentation_id'] = 5
+            network_msg['network']['provider:segmentation_id'] = random.randint(5, 1000)
 
         network = quantum.create_network(network_msg)['network']
     else:
@@ -146,22 +147,44 @@ if __name__ == '__main__':
     if opts.router:
         routers = quantum.list_routers(name=opts.router)
         if len(routers['routers']) == 0:
-            logging.error('Unable to locate provider router %s', opts.router)
-            sys.exit(1)
+            logging.info('Creating tenant router for external network access')
+            router = quantum.create_router(
+                {'router': {'name': opts.router, 'tenant_id': tenant_id}}
+            )['router']
+            logging.info('New router created: %s', (router['id']))
         else:
-            # Check to see if subnet already plugged into router
-            ports = quantum.list_ports(device_owner='network:router_interface',
-                                       network_id=network['id'])
-
-            ha_ports = quantum.list_ports(
-                device_owner='network:ha_router_replicated_interface',
-                network_id=network['id'])
-
-            if len(ports['ports'] + ha_ports['ports']) == 0:
-                logging.info('Adding interface from %s to %s',
-                             opts.router, subnet_name)
-                router = routers['routers'][0]
-                quantum.add_interface_router(router['id'],
-                                             {'subnet_id': subnet['id']})
-            else:
-                logging.warning('Router already connected to subnet')
+            logging.warning('Router {} already exists.'.format(opts.router))
+            router = routers['routers'][0]
+        # Check to see if subnet already plugged into router
+        ports = quantum.list_ports(device_owner='network:router_interface',
+                                   network_id=network['id'])
+
+        dist_ports = quantum.list_ports(
+            device_owner='network:router_interface_distributed',
+            network_id=network['id'])
+
+        ha_ports = quantum.list_ports(
+            device_owner='network:ha_router_replicated_interface',
+            network_id=network['id'])
+
+        if len(ports['ports'] + ha_ports['ports'] + dist_ports['ports']) == 0:
+            logging.info('Adding interface from %s to %s',
+                         opts.router, subnet_name)
+            quantum.add_interface_router(router['id'],
+                                         {'subnet_id': subnet['id']})
+        else:
+            logging.warning('Router already connected to subnet')
+
+        if not router['external_gateway_info']:
+
+            ext_network = quantum.list_networks(name='ext_net')['networks'][0]
+
+            logging.info('Plugging router into ext_net')
+            router = quantum.add_gateway_router(
+                router=router['id'],
+                body={'network_id': ext_network['id']}
+            )
+            logging.info('Router connected to %s', 'ext_net')
+        else:
+            logging.warning('Router already connect to %s', 'ext_net')
+
diff --git a/openstack/bin/neutron-tenant-net-ksv3 b/openstack/bin/neutron-tenant-net-ksv3
index 42b9f0b..6dd2091 100755
--- a/openstack/bin/neutron-tenant-net-ksv3
+++ b/openstack/bin/neutron-tenant-net-ksv3
@@ -5,6 +5,7 @@ from keystoneclient import session, v3
 from neutronclient.v2_0 import client
 import optparse
 import os
+import random
 import sys
 import logging
 
@@ -72,9 +73,17 @@ if __name__ == '__main__':
     quantum = client.Client(session=sess)
 
     # Resolve tenant id
-    project_id = auth.get_project_id(sess)
+    project_id = None
+    if opts.project != 'admin':
+        for project in keystone.projects.list():
+            if project.name == opts.project:
+                project_id = project.id
+                break  # Tenant ID found - stop looking
+    else:
+        project_id = auth.get_project_id(sess)
+
     if not project_id:
-        logging.error("Unable to locate project id for %s.", opts.tenant)
+        logging.error("Unable to locate project id for %s.", opts.project)
         sys.exit(1)
 
     # Create network
@@ -93,10 +102,10 @@ if __name__ == '__main__':
         if opts.network_type == 'vxlan':
             network_msg['network']['provider:segmentation_id'] = 1233
         elif opts.network_type == 'vlan':
-            network_msg['network']['provider:segmentation_id'] = 5
+            network_msg['network']['provider:segmentation_id'] = random.randint(5, 1000)
             network_msg['network']['provider:physical_network'] = 'physnet1'
         else:
-            network_msg['network']['provider:segmentation_id'] = 5
+            network_msg['network']['provider:segmentation_id'] = random.randint(5, 1000)
 
         network = quantum.create_network(network_msg)['network']
     else:
@@ -139,17 +148,44 @@ if __name__ == '__main__':
     if opts.router:
         routers = quantum.list_routers(name=opts.router)
         if len(routers['routers']) == 0:
-            logging.error('Unable to locate provider router %s', opts.router)
-            sys.exit(1)
+            logging.info('Creating tenant router for external network access')
+            router = quantum.create_router(
+                {'router': {'name': opts.router, 'tenant_id': project_id}}
+            )['router']
+            logging.info('New router created: %s', (router['id']))
+        else:
+            logging.warning('Router {} already exists.'.format(opts.router))
+            router = routers['routers'][0]
+        # Check to see if subnet already plugged into router
+        ports = quantum.list_ports(device_owner='network:router_interface',
+                                   network_id=network['id'])
+
+        dist_ports = quantum.list_ports(
+            device_owner='network:router_interface_distributed',
+            network_id=network['id'])
+
+        ha_ports = quantum.list_ports(
+            device_owner='network:ha_router_replicated_interface',
+            network_id=network['id'])
+
+        if len(ports['ports'] + ha_ports['ports'] + dist_ports['ports']) == 0:
+            logging.info('Adding interface from %s to %s',
+                         opts.router, subnet_name)
+            quantum.add_interface_router(router['id'],
+                                         {'subnet_id': subnet['id']})
+        else:
+            logging.warning('Router already connected to subnet')
+
+        if not router['external_gateway_info']:
+
+            ext_network = quantum.list_networks(name='ext_net')['networks'][0]
+
+            logging.info('Plugging router into ext_net')
+            router = quantum.add_gateway_router(
+                router=router['id'],
+                body={'network_id': ext_network['id']}
+            )
+            logging.info('Router connected to %s', 'ext_net')
         else:
-            # Check to see if subnet already plugged into router
-            ports = quantum.list_ports(device_owner='network:router_interface',
-                                       network_id=network['id'])
-            if len(ports['ports']) == 0:
-                logging.info('Adding interface from %s to %s',
-                             opts.router, subnet_name)
-                router = routers['routers'][0]
-                quantum.add_interface_router(router['id'],
-                                             {'subnet_id': subnet['id']})
-            else:
-                logging.warning('Router already connected to subnet')
+            logging.warning('Router already connect to %s', 'ext_net')
+
diff --git a/openstack/profiles/default b/openstack/profiles/default
index ce561e0..811526c 100755
--- a/openstack/profiles/default
+++ b/openstack/profiles/default
@@ -34,15 +34,17 @@ fi
 source novarc
 
 if is_ksv3; then
-  ./bin/neutron-ext-net-ksv3 --project admin --network-type flat -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
-  ./bin/neutron-tenant-net-ksv3 --project admin --network-type $net_type -r provider-router $NS_ARG private $CIDR_PRIV
   # Create demo/testing users, tenants and flavor
   create_tempest_users_v3
+  ./bin/neutron-ext-net-ksv3 --project admin --network-type flat -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
+  ./bin/neutron-tenant-net-ksv3 --project admin --network-type $net_type -r provider-router $NS_ARG private $CIDR_PRIV
+  ./bin/neutron-tenant-net-ksv3 --project demo --network-type $net_type -r demo-router $NS_ARG private-demo $CIDR_PRIV
 else
-  ./bin/neutron-ext-net --network-type flat -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
-  ./bin/neutron-tenant-net --network-type $net_type -t admin -r provider-router $NS_ARG private $CIDR_PRIV
   # Create demo/testing users, tenants and flavor
   create_tempest_users
+  ./bin/neutron-ext-net --network-type flat -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
+  ./bin/neutron-tenant-net --network-type $net_type -t admin -r provider-router $NS_ARG private $CIDR_PRIV
+  ./bin/neutron-tenant-net --network-type $net_type -t demo -r demo-router $NS_ARG private-demo $CIDR_PRIV
 fi
 
 # Download images if not already present
@@ -74,3 +76,4 @@ image_alt_id=$(openstack image list --name cirros2 -f value -c ID 2>/dev/null ||
 echo "Flavors"
 create_tempest_flavors
 create_default_flavors
+