Merge lp:~gnuoy/openstack-charm-testing/ksv3 into lp:openstack-charm-testing

[Liam Young]

[lp:~gnuoy/openstack-charm-testing/ksv3]

177. By Liam Young on 2016-02-12

Add OS_AUTH_VERSION to make swift client Keystone v3 aware

[Ryan Beisner (1chb1n)]

I believe similar functionality was merged into o-c-t in a separate proposal. If that is not the case, please rebase and update this proposal. Thank you!

review: Needs Information

[Ryan Beisner (1chb1n)]

Closing MP, per previous comment, please resubmit if updates are still needed. Thank you!

review: Needs Resubmitting

Unmerged revisions

177. By Liam Young on 2016-02-12

Add OS_AUTH_VERSION to make swift client Keystone v3 aware

176. By Liam Young on 2016-02-11

Fix up novarc

175. By Liam Young on 2016-02-11

Fix router list

174. By Liam Young on 2016-02-10

Added ksv3 setup scripts

=== added file 'bin/neutron-ext-net-ksv3'
--- bin/neutron-ext-net-ksv3	1970-01-01 00:00:00 +0000
+++ bin/neutron-ext-net-ksv3	2016-02-12 13:19:26 +0000
@@ -0,0 +1,163 @@
+#!/usr/bin/python
+
+from keystoneclient.auth import identity
+from keystoneclient import session, v3
+from neutronclient.v2_0 import client
+import optparse
+import os
+import sys
+import logging
+
+
+usage = """Usage: %prog [options] ext_net_name
+
+For example:
+
+  %prog -g 192.168.21.1 -c 192.168.21.0/25 \\
+      -f 192.168.21.100:192.168.21.200 ext_net
+"""
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser(usage)
+    parser.add_option('-p', '--project',
+                      help='Project name to create network for',
+                      dest='project', action='store',
+                      default=None)
+    parser.add_option("-d", "--debug",
+                      help="Enable debug logging",
+                      dest="debug", action="store_true", default=False)
+    parser.add_option("-g", "--gateway",
+                      help="Default gateway to use.",
+                      dest="default_gateway", action="store", default=None)
+    parser.add_option("-c", "--cidr",
+                      help="CIDR of external network.",
+                      dest="cidr", action="store", default=None)
+    parser.add_option("-f", "--floating-range",
+                      help="Range of floating IP's to use (separated by :).",
+                      dest="floating_range", action="store", default=None)
+    parser.add_option("--network-type",
+                      help="Network type.",
+                      dest="network_type", action="store", default='gre')
+    (opts, args) = parser.parse_args()
+
+    if len(args) != 1:
+        parser.print_help()
+        sys.exit(1)
+
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    net_name = args[0]
+    subnet_name = '{}_subnet'.format(net_name)
+
+    if (opts.floating_range):
+        (start_floating_ip, end_floating_ip) = opts.floating_range.split(':')
+    else:
+        start_floating_ip = None
+        end_floating_ip = None
+
+    auth = identity.v3.Password(
+        user_domain_name=os.environ['OS_DEFAULT_DOMAIN'],
+        username=os.environ['OS_USERNAME'],
+        password=os.environ['OS_PASSWORD'],
+        project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'],
+        project_name=os.environ['OS_PROJECT_NAME'],
+        auth_url=os.environ['OS_AUTH_URL'])
+    sess = session.Session(auth=auth)
+
+    # Clients support sessions
+    keystone = v3.Client(session=sess)
+    quantum = client.Client(session=sess)
+
+    # Resolve tenant id
+    project_id = None
+    for proj in [t._info for t in keystone.projects.list()]:
+        if (proj['name'] ==
+            (opts.project or os.environ['OS_PROJECT_NAME'])):
+            project_id = proj['id']
+            break  # Tenant ID found - stop looking
+    if not project_id:
+        logging.error("Unable to locate project id for %s.", opts.tenant)
+        sys.exit(1)
+
+    networks = quantum.list_networks(name=net_name)
+    if len(networks['networks']) == 0:
+        logging.info("Configuring external network '%s'", net_name)
+        network_msg = {
+            'network': {
+                'name': net_name,
+                'router:external': True,
+                'tenant_id': project_id,
+                'provider:network_type': opts.network_type,
+            }
+        }
+
+        if opts.network_type == 'vxlan':
+            network_msg['network']['provider:segmentation_id'] = 1234
+        elif opts.network_type == 'vlan':
+            network_msg['network']['provider:segmentation_id'] = 2
+            network_msg['network']['provider:physical_network'] = 'physnet1'
+        else:
+            network_msg['network']['provider:segmentation_id'] = 2
+
+        logging.info('Creating new external network definition: %s', net_name)
+        network = quantum.create_network(network_msg)['network']
+        logging.info('New external network created: %s', network['id'])
+    else:
+        logging.warning('Network %s already exists.', net_name)
+        network = networks['networks'][0]
+
+    subnets = quantum.list_subnets(name=subnet_name)
+    if len(subnets['subnets']) == 0:
+        subnet_msg = {
+            'name': subnet_name,
+            'network_id': network['id'],
+            'enable_dhcp': False,
+            'ip_version': 4,
+            'tenant_id': project_id
+        }
+
+        if opts.default_gateway:
+            subnet_msg['gateway_ip'] = opts.default_gateway
+        if opts.cidr:
+            subnet_msg['cidr'] = opts.cidr
+        if (start_floating_ip and end_floating_ip):
+            subnet_msg['allocation_pools'] = [
+                    {
+                    'start': start_floating_ip,
+                    'end': end_floating_ip
+                    }
+             ]
+
+        logging.info('Creating new subnet for %s', net_name)
+        subnet = quantum.create_subnet({'subnet': subnet_msg})['subnet']
+        logging.info('New subnet created: %s', subnet['id'])
+    else:
+        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)
 
=== added file 'bin/neutron-tenant-net-ksv3'
--- bin/neutron-tenant-net-ksv3	1970-01-01 00:00:00 +0000
+++ bin/neutron-tenant-net-ksv3	2016-02-12 13:19:26 +0000
@@ -0,0 +1,161 @@
+#!/usr/bin/python
+
+from keystoneclient.auth import identity
+from keystoneclient import session, v3
+from neutronclient.v2_0 import client
+import optparse
+import os
+import sys
+import logging
+
+usage = """Usage: %prog [options] name cidr
+
+For example:
+
+  %prog -t admin -r provider-router admin_net 10.5.5.0/24
+
+will create a new network for the admin tenant called 'admin_net' with a
+default gateway of 10.5.5.1 and a dhcp allocation range of
+10.5.5.2->10.5.5.254
+"""
+
+if __name__ == '__main__':
+    parser = optparse.OptionParser(usage)
+    parser.add_option('-p', '--project',
+                      help='Project name to create network for',
+                      dest='project', action='store',
+                      default=None)
+    parser.add_option('-s', '--shared',
+                      help='Create a shared rather than private network',
+                      dest='shared', action='store_true', default=False)
+    parser.add_option('-r', '--router',
+                      help='Router to plug new network into',
+                      dest='router', action='store', default=None)
+    parser.add_option("-d", "--debug",
+                      help="Enable debug logging",
+                      dest="debug", action="store_true",  default=False)
+    parser.add_option("-D", "--disable-dhcp",
+                      help="Disable dhcp on network",
+                      dest="dhcp", action="store_false",  default=True)
+    parser.add_option("-N", "--dns-nameservers",
+                      help="Comma separated list of dns servers to use.",
+                      dest="dns_servers", action="store",  default=None)
+    parser.add_option("--network-type",
+                      help="Network type.",
+                      dest="network_type", action="store", default='gre')
+    (opts, args) = parser.parse_args()
+
+    if len(args) != 2:
+        parser.print_help()
+        sys.exit(1)
+
+    if opts.debug:
+        logging.basicConfig(level=logging.DEBUG)
+    else:
+        logging.basicConfig(level=logging.INFO)
+
+    net_name = args[0]
+    subnet_name = "{}_subnet".format(net_name)
+    cidr = args[1]
+
+
+    auth = identity.v3.Password(
+        user_domain_name=os.environ['OS_DEFAULT_DOMAIN'],
+        username=os.environ['OS_USERNAME'],
+        password=os.environ['OS_PASSWORD'],
+        project_domain_name=os.environ['OS_PROJECT_DOMAIN_NAME'],
+        project_name=os.environ['OS_PROJECT_NAME'],
+        auth_url=os.environ['OS_AUTH_URL'])
+    sess = session.Session(auth=auth)
+
+    # Clients support sessions
+    keystone = v3.Client(session=sess)
+    quantum = client.Client(session=sess)
+
+    # Resolve tenant id
+    project_id = None
+    for proj in [t._info for t in keystone.projects.list()]:
+        if (proj['name'] ==
+            (opts.project or os.environ['OS_PROJECT_NAME'])):
+            project_id = proj['id']
+            break  # Tenant ID found - stop looking
+    if not project_id:
+        logging.error("Unable to locate project id for %s.", opts.tenant)
+        sys.exit(1)
+
+    # Create network
+    networks = quantum.list_networks(name=net_name)
+    if len(networks['networks']) == 0:
+        logging.info('Creating tenant network: %s', net_name)
+        network_msg = {
+            'network': {
+                'name': net_name,
+                'shared': opts.shared,
+                'tenant_id': project_id,
+                'provider:network_type': opts.network_type,
+            }
+        }
+
+        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:physical_network'] = 'physnet1'
+        else:
+            network_msg['network']['provider:segmentation_id'] = 5
+
+        network = quantum.create_network(network_msg)['network']
+    else:
+        logging.warning('Network %s already exists.', net_name)
+        network = networks['networks'][0]
+
+    # Create subnet
+    subnets = quantum.list_subnets(name=subnet_name)
+    if len(subnets['subnets']) == 0:
+        logging.info('Creating subnet for %s',
+                     net_name)
+        subnet_msg = {
+            'subnet': {
+                'name': subnet_name,
+                'network_id': network['id'],
+                'enable_dhcp': opts.dhcp,
+                'cidr': cidr,
+                'ip_version': 4,
+                'tenant_id': project_id
+            }
+        }
+        subnet = quantum.create_subnet(subnet_msg)['subnet']
+    else:
+        logging.warning('Subnet %s already exists.', subnet_name)
+        subnet = subnets['subnets'][0]
+
+    # Update dns_nameservers
+    if opts.dns_servers:
+        msg = {
+            'subnet': {
+                'dns_nameservers': opts.dns_servers.split(',')
+            }
+        }
+        logging.info('Updating dns_nameservers (%s) for subnet %s',
+                     opts.dns_servers,
+                     subnet_name)
+        quantum.update_subnet(subnet['id'], msg)
+
+    # Plug subnet into router if provided
+    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)
+        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')
 
=== modified file 'configure'
--- configure	2016-01-05 21:04:33 +0000
+++ configure	2016-02-12 13:19:26 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-valid="default stsstack dellstack kernelstack ppc64el powerkvm lxd multihypervisor"
+valid="default defaultksv3 stsstack dellstack kernelstack ppc64el powerkvm lxd multihypervisor"
 
 usage() {
   echo "$0 <profile>"
 
=== modified file 'novarc'
--- novarc	2014-02-27 15:35:17 +0000
+++ novarc	2016-02-12 13:19:26 +0000
@@ -1,4 +1,17 @@
 #!/bin/bash
+
+# Stop Keystone v3 env polluting v2 env
+unset OS_REGION_NAME
+unset OS_DEFAULT_DOMAIN
+unset OS_USER_DOMAIN_ID
+unset OS_PROJECT_NAME
+unset OS_IDENTITY_API_VERSION
+unset OS_PASSWORD
+unset OS_AUTH_URL
+unset OS_USERNAME
+unset OS_PROJECT_DOMAIN_NAME
+unset OS_AUTH_VERSION
+
 export OS_USERNAME=admin
 export OS_PASSWORD=openstack
 export OS_TENANT_NAME=admin
 
=== added file 'novarcv3'
--- novarcv3	1970-01-01 00:00:00 +0000
+++ novarcv3	2016-02-12 13:19:26 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+export OS_USERNAME=admin
+export OS_PASSWORD=openstack
+export OS_REGION_NAME=RegionOne
+export OS_AUTH_URL=${OS_AUTH_PROTOCOL:-http}://`juju-deployer -f keystone`:5000/v3
+export OS_DEFAULT_DOMAIN=default
+export OS_PROJECT_NAME=admin
+export OS_PROJECT_DOMAIN_NAME=default
+export OS_IDENTITY_API_VERSION=3
+export export OS_USER_DOMAIN_ID=default
+# Swift needs this:
+export OS_AUTH_VERSION=3
 
=== added file 'profiles/defaultksv3'
--- profiles/defaultksv3	1970-01-01 00:00:00 +0000
+++ profiles/defaultksv3	2016-02-12 13:19:26 +0000
@@ -0,0 +1,97 @@
+#!/bin/bash
+
+set -e
+
+function upload_image {
+    src=$1
+    image_name=$2
+    image_file=$3
+    case "$src" in
+        swift) http_root="http://$SWIFT_IP:80/swift/v1/images";;
+        cloudimages) http_root="http://cloud-images.ubuntu.com/${image_name}/current";;
+    esac
+    [ -f ~/images/$image_file ] || {
+        wget -O ~/images/$image_file ${http_root}/${image_file}
+    }
+    openstack image show $image_name || {
+        openstack image create --container-format=bare --disk-format=qcow2 --file=${HOME}/images/$image_file  $image_name
+    }
+}
+
+# Install dependencies and CLI tools
+# See also requirements.txt in tempest (probably need to sudo pip install -r requirements.txt)
+sudo apt-get install git testrepository subunit python-nose python-lxml python-boto \
+    python-junitxml python-subunit python-testresources python-oslotest python-stevedore \
+    python-cinderclient python-glanceclient python-heatclient python-keystoneclient \
+    python-neutronclient python-novaclient python-swiftclient python-ceilometerclient \
+    openvswitch-test openvswitch-common -y
+
+# Set serverstack defaults, if not already set.
+[[ -z "$GATEWAY" ]] && export GATEWAY="10.5.0.1"
+[[ -z "$CIDR_EXT" ]] && export CIDR_EXT="10.5.0.0/16"
+[[ -z "$FIP_RANGE" ]] && export FIP_RANGE="10.5.150.0:10.5.200.254"
+[[ -z "$NAMESERVER" ]] && export NAMESERVER="10.245.160.2"
+[[ -z "$CIDR_PRIV" ]] && export CIDR_PRIV="192.168.21.0/24"
+[[ -z "$SWIFT_IP" ]] && export SWIFT_IP="10.245.161.162"
+
+# Accept network type as first parameter, assume gre if unspecified
+net_type=${1:-"gre"}
+
+# If not on bare metal, add extra port to overcloud neutron-gateway and configure charm to use it
+if [[ "${BARE_METAL^^}" != "TRUE" ]]; then
+    unset OS_DEFAULT_DOMAIN OS_PROJECT_NAME OS_IDENTITY_API_VERSION OS_PROJECT_DOMAIN_NAME
+    source ~/novarc
+    ./bin/post-deploy-config neutron-gateway
+fi
+# Configure neutron networking on overcloud
+source novarcv3
+./bin/neutron-ext-net-ksv3 --network-type $net_type -g $GATEWAY -c $CIDR_EXT -f $FIP_RANGE ext_net
+./bin/neutron-tenant-net-ksv3 --network-type $net_type -p admin -r provider-router -N $NAMESERVER private $CIDR_PRIV
+
+# Download images if not already present
+mkdir -vp ~/images
+upload_image cloudimages wily wily-server-cloudimg-amd64-disk1.img
+upload_image cloudimages vivid vivid-server-cloudimg-amd64-disk1.img
+upload_image cloudimages trusty trusty-server-cloudimg-amd64-disk1.img
+upload_image cloudimages precise precise-server-cloudimg-amd64-disk1.img
+upload_image swift cirros cirros-0.3.4-x86_64-disk.img
+
+# Create demo/testing users, tenants and flavor
+openstack project show demo || openstack project create demo
+openstack user show demo || openstack user create --project demo --password pass --enable --email [e-mail] demo
+openstack role show Member || openstack role create Member
+openstack role add --user demo --project demo Member
+openstack project show alt_demo || openstack project create alt_demo
+openstack user show alt_demo || openstack user create --project alt_demo --password secret --enable --email [e-mail] alt_demo
+openstack role add --user alt_demo --project alt_demo Member
+
+openstack flavor show m1.cirros || openstack flavor create --id 6 --ram 64 --disk 1 --vcpus 1 m1.cirros
+openstack flavor show m1.tempest || openstack flavor create --id 7 --ram 256 --disk 5 --vcpus 1 m1.tempest
+openstack flavor show m2.tempest || openstack flavor create --id 8 --ram 512 --disk 5 --vcpus 1 m2.tempest
+exit 0
+# Gather vars for tempest template
+access=$(openstack ec2 credentials create --user demo --project demo  | awk '/access/ {print $4}')
+secret=$(openstack ec2 credentials show $access  | awk '/secret/ {print $4}')
+image_id=$(openstack image list | awk '/cirros/ {print $2}')
+image_alt_id=$(openstack image list | awk '/precise/ {print $2}')
+ext_net=$(openstack network list | awk '/ext_net/ {print $2}')
+# This needs fixing:
+router=$(neutron --os-user-domain-id default --os-project-domain-id default router-list | grep provider-router | awk '{ print $2}')
+keystone=$(juju-deployer -f keystone)
+dashboard=$(juju-deployer -f openstack-dashboard)
+ncc=$(juju-deployer -f nova-cloud-controller)
+http=${OS_AUTH_PROTOCOL:-http}
+
+# Insert vars into tempest conf
+sed -e "s/__IMAGE_ID__/$image_id/g" -e "s/__IMAGE_ALT_ID__/$image_alt_id/g" \
+    -e "s/__DASHBOARD__/$dashboard/g" -e "s/__KEYSTONE__/$keystone/g" \
+    -e "s/__EXT_NET__/$ext_net/g" -e "s/__PROTO__/$http/g" \
+    -e "s/__SWIFT__/$SWIFT_IP/g" \
+    -e "s/__NAMESERVER__/$NAMESERVER/g" \
+    -e "s/__CIDR_PRIV__/${CIDR_PRIV////\\/}/g" \
+    -e "s/__NCC__/$ncc/g" -e "s/__SECRET__/$secret/g" -e "s/__ACCESS__/$access/g" \
+    templates/tempest/tempest.conf.template > tempest.conf
+
+# Git tempest, place the rendered tempest template
+[ -d tempest ] || git clone https://github.com/openstack/tempest
+cp tempest.conf tempest/etc