Merge lp:~mbruzek/charms/trusty/nuage-vrsg/network-config into lp:~alai/charms/trusty/nuage-vrsg/network-config

[Matt Bruzek]

[Matt Bruzek (mbruzek)]

Here is the proposed changes for running the network configuration that you asked me about.

[Ashley Lai (alai)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2016-05-19 18:49:55 +0000
+++ hooks/hooks.py	2016-05-20 17:29:37 +0000
@@ -2,6 +2,7 @@
 # vim: set et ts=4:
 
 import sys
+import subprocess
 
 from helper_functions import (
     config_value_changed,
@@ -18,6 +19,7 @@
     log,
     ERROR,
     Hooks,
+    unit_get,
     UnregisteredHookError,
     relation_get,
     status_set,
@@ -110,7 +112,44 @@
         # Configure access port
         configure_access_port()
         status_set('active', 'configured access port')
-    
+
+    # Check if any of the network configuration parameters have changed.
+    if (config_value_changed('gateway-port-name') or
+            config_value_changed('vlan-id') or
+            config_value_changed('vsd-vm-ip-address') or
+            config_value_chagned('uplink-subnet') or
+            config_value_changed('uplink-netmask') or
+            config_value_changed('uplink-gateway-ip') or
+            config_value_changed('uplink-ip') or
+            config_value_changed('uplink-intf-mac') or
+            config_value_changed('fip-id')):
+        # The network configuration parameters have changed, run the script.
+        private_address = unit_get('private-address')
+        gateway_port_name = config('gateway-port-name')
+        vlan_id = config('vlan-id')
+        vsd_ip = config('vsd-vm-ip-address')
+        uplink_subnet = config('uplink-subnet')
+        uplink_netmask = config('uplink-netmask')
+        uplink_gateway_ip = config('uplink-gateway-ip')
+        uplink_ip = config('uplink-ip')
+        uplink_intf_mac = config('uplink-intf-mac')
+        fip_id = config('fip-id')
+        # Ensure all variables are not None.
+        if (gateway_port_name and vlan_id and vsd_ip and uplink_netmask and
+                uplink_gateway_ip and uplink_ip and uplink_intf_mac and fpid):
+            # Pass the config values to the script.
+            command = ['configure-network.sh', private_address, gateway_port_name,
+                       vlan_id, uplink_subnet, uplink_netmask, uplink_gateway_ip,
+                       uplink_ip, uplink_intf_mac, fip_id]
+            subprocess.check_call(command)
+            string = '[GATEWAY]\n'
+            string += 'gateway_ip = {0}\n'.format(gateway_ip)
+
+            with open('/opt/nuage_fip_gateway.ini', 'w') as stream:
+                stream.write(string)
+
+            subprocess.check_call(['mytest'])
+
 
 @hooks.hook('vrsg-controller-service-relation-changed')
 def vrsg_controller_changed(relation_id=None, remote_unit=None):
 
=== removed file 'hooks/network-config-relation-changed'
--- hooks/network-config-relation-changed	2016-05-20 13:47:47 +0000
+++ hooks/network-config-relation-changed	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-gateway_ip1=`unit-get private-address`
-echo "gateway_ip1=$gateway_ip1 "
-gateway_ip=`nslookup $gateway_ip1 | awk '/^Address: / { print $2 ; exit }'`
-echo "gateway_ip=$gateway_ip "
-test=$(nslookup $(unit-get private-address) | awk '/^Address: / { print $2 ; exit }')
-echo "test=$test "
-gateway_port_name=`config-get gateway-port-name`
-vlan_id=`config-get vlan-id`
-vsd_ip=`relation-get vsd-vm-ip-address`
-uplink_subnet=`config-get uplink-subnet`
-uplink_netmask=`config-get uplink-netmask`
-uplink_gateway_ip=`config-get uplink-gateway-ip`
-uplink_ip=`config-get uplink-ip`
-uplink_intf_mac=`config-get uplink-intf-mac`
-fip_id=`config-get fip-id`
-
-if [ -z "$gateway_ip" ]; then
-    echo "gateway_ip is not set"
-    exit 0
-fi
-
-if [ -z "$gateway_port_name" ]; then
-    echo "gateway_port_name is not set"
-    exit 0
-fi
-
-if [ -z "$vlan_id" ]; then
-    echo "vlan_id is not set"
-    exit 0
-fi
-
-if [ -z "$vsd_ip" ]; then
-    echo "vsd_ip is not set"
-    exit 0
-fi
-
-if [ -z "$uplink_subnet" ]; then
-    echo "uplink_subnet is not set"
-    exit 0
-fi
-
-if [ -z "$uplink_netmask" ]; then
-    echo "uplink_netmask is not set"
-    exit 0
-fi
-
-if [ -z "$uplink_gateway_ip" ]; then
-    echo "uplink_gateway_ip is not set"
-    exit 0
-fi
-
-if [ -z "$uplink_ip" ]; then
-    echo "uplink_ip is not set"
-    exit 0
-fi
-
-if [ -z "$uplink_intf_mac" ]; then
-    echo "uplink_intf_mac is not set"
-    exit 0
-fi
-
-if [ -z "$fip_id" ]; then
-    echo "fip_id is not set"
-    exit 0
-fi
-
-cat << EOF > /opt/nuage_fip_gateway.ini
-[GATEWAY]
-gateway_ip = $gateway_ip
-gateway_port_name = $gateway_port_name
-vlan_id = $vlan_id
-vsd_ip = $vsd_ip
-uplink_subnet = $uplink_subnet
-uplink_netmask = $uplink_netmask
-uplink_gateway_ip = $uplink_gateway_ip
-uplink_ip = $uplink_ip
-uplink_intf_mac = $uplink_intf_mac
-fip_id = $fip_id
-EOF
-
-./mytest
 
=== modified file 'metadata.yaml'
--- metadata.yaml	2016-05-19 00:41:01 +0000
+++ metadata.yaml	2016-05-20 17:29:37 +0000
@@ -8,12 +8,10 @@
  Nuage VRS-G provides a highly flexible, high performance, secure network
  virtualization solution for data centers.
  .
- This charm is used to configure a gateway 
+ This charm is used to configure a gateway
 requires:
   vrsg-controller-service:
     interface: nuage-vrsg-control
   vsd-rest-api:
     interface: vsd-rest-api
     scope: global
-  network-config:
-    interface: nuage-network-config