Merge lp:~james-page/openstack-charm-testing/ext-port-configuration into lp:openstack-charm-testing

[James Page]

[lp:~james-page/openstack-charm-testing/ext-port-configuration]

216. By James Page on 2016-06-10

Drop keystoneclient usage

=== modified file 'bin/post-deploy-config'
--- bin/post-deploy-config	2016-05-09 14:04:13 +0000
+++ bin/post-deploy-config	2016-06-10 09:26:21 +0000
@@ -5,41 +5,61 @@
 import os
 import sys
 
-cmd_out = subprocess.check_output(['neutron', 'net-list'])
-
-net_id = os.environ.get('NET_ID')
-
-if net_id:
-    # Use OSCI / Jenkins environment variable if defined.
-    print 'Using NET_ID environment variable: {}'.format(net_id)
-else:
-    # Preserve existing default behavior (eg. manual testing)
-    net_name = os.environ['OS_USERNAME'] + '_admin_net'
-    print('Using default network name: {}'.format(net_name))
-    for line in cmd_out.split('\n'):
-        if net_name in line:
-            net_id = line.split('|')[1].replace(' ', '')
-
-service = sys.argv[1]
-
-ext_port = 'eth1'
-if len(sys.argv) >= 3:
-    ext_port = sys.argv[2]
-
-service_config = yaml.load(
-    subprocess.check_output(['juju', 'status', service])
-)
-
-uuids = []
-for machine in service_config['machines']:
-    uuids.append(service_config['machines'][machine]['instance-id'])
-
-if len(uuids) > 0:
-    for uuid in uuids:
-        print("Attaching interface to instance {}".format(uuid))
-        subprocess.check_call(
-            ['nova', 'interface-attach', '--net-id', net_id, uuid]
-        )
-
-print("Setting ext-port configuration on neutron-gateway to {}".format(ext_port))
-subprocess.check_call(['juju', 'set', service, 'ext-port={}'.format(ext_port)])
+from neutronclient.v2_0 import client as ne_client
+from novaclient import client as no_client
+
+if __name__ == '__main__':
+    neutron = ne_client.Client(username=os.environ['OS_USERNAME'],
+                               password=os.environ['OS_PASSWORD'],
+                               tenant_name=os.environ['OS_TENANT_NAME'],
+                               auth_url=os.environ['OS_AUTH_URL'],
+                               region_name=os.environ['OS_REGION_NAME'])
+    nova = no_client.Client('2',
+                            os.environ['OS_USERNAME'],
+                            os.environ['OS_PASSWORD'],
+                            os.environ['OS_TENANT_NAME'],
+                            os.environ['OS_AUTH_URL'],
+                            os.environ['OS_REGION_NAME'])
+
+    net_id = os.environ.get('NET_ID')
+    if net_id:
+        # Use OSCI / Jenkins environment variable if defined.
+        print('Using NET_ID environment variable: {}'.format(net_id))
+    else:
+        # Preserve existing default behavior (eg. manual testing)
+        net_name = os.environ['OS_USERNAME'] + '_admin_net'
+        print('Using default network name: {}'.format(net_name))
+        try:
+            network = neutron.list_networks(name=net_name)['networks'][0]
+            net_id = network['id']
+        except IndexError:
+            print('Unable to find local network {}'.format(net_name))
+            raise ValueError('Unable to find local network {}'.format(net_name))
+
+    service = sys.argv[1]
+
+    service_config = yaml.load(
+        subprocess.check_output(['juju', 'status', service])
+    )
+
+    uuids = []
+    for machine in service_config['machines']:
+        uuids.append(service_config['machines'][machine]['instance-id'])
+
+    ext_port = []
+    if len(sys.argv) >= 3:
+        ext_port = [sys.argv[2]]
+
+    if len(uuids) > 0:
+        for uuid in uuids:
+            print("Attaching interface to instance {}".format(uuid))
+            server = nova.servers.get(uuid)
+            result = server.interface_attach(port_id=None,
+                                             net_id=net_id,
+                                             fixed_ip=None).to_dict()
+            ext_port.append(result['mac_addr'])
+
+    ports = " ".join(ext_port)
+    print("Setting ext-port configuration on {} to {}".format(service, ports))
+    subprocess.check_call(['juju', 'set', service, 'ext-port={}'.format(ports)])
+