removing enabled_network_list as an argument to network env

NetworkSettings Object is being rendered and passed to net env object
already. We can get the enabled network list from the network settings object
instead of passing it in as an arg. Basically just removing duplicate
arguments to the network env object.

Change-Id: I828c60878a0432cae2b37c08ae1896dce49071d0
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index 829b3a0..b6aaafa 100755 (executable)
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -95,19 +95,19 @@ def build_nic_template(args):
     """
     template_dir, template = args.template.rsplit('/', 1)
 
-    network_settings = NetworkSettings(args.net_settings_file,
-                                       args.network_isolation)
+    netsets = NetworkSettings(args.net_settings_file,
+                              args.network_isolation)
     env = Environment(loader=FileSystemLoader(template_dir))
     template = env.get_template(template)
 
     # gather vlan values into a dict
-    net_list = copy(args.enabled_networks).split(' ')
+    net_list = copy(netsets.enabled_network_list)
     net_list.remove(ADMIN_NETWORK)
-    vlans_vals = map(lambda x: network_settings[x]['vlan'], net_list)
+    vlans_vals = map(lambda x: netsets[x]['vlan'], net_list)
     vlans = dict(zip(net_list, vlans_vals))
-    nics = network_settings.nics
+    nics = netsets.nics
 
-    print(template.render(enabled_networks=args.enabled_networks,
+    print(template.render(enabled_networks=netsets.enabled_network_list,
                           role=args.role,
                           vlans=vlans,
                           external_net_type=args.ext_net_type,
@@ -174,9 +174,6 @@ def get_parser():
     nic_template.add_argument('--flat', action='store_false',
                               default=True, dest='network_isolation',
                               help='disable network isolation')
-    nic_template.add_argument('-n', '--enabled-networks', required=True,
-                              dest='enabled_networks',
-                              help='enabled network list')
     nic_template.add_argument('-e', '--ext-net-type', default='interface',
                               dest='ext_net_type',
                               choices=['interface', 'br-ex'],

diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index f5b53ee..5e9a5ca 100755 (executable)
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -136,12 +136,12 @@ function configure_undercloud {
       ovs_dpdk_bridge=''
     fi
 
-    if ! controller_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e "br-ex" -af $ip_addr_family); then
+    if ! controller_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r controller -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -e "br-ex" -af $ip_addr_family); then
       echo -e "${red}ERROR: Failed to generate controller NIC heat template ${reset}"
       exit 1
     fi
 
-    if ! compute_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -n "$enabled_network_list" -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then
+    if ! compute_nic_template=$(python3.4 -B $LIB/python/apex_python_utils.py nic-template -r compute -s $NETSETS $net_isolation_arg -t $CONFIG/nics-template.yaml.jinja2 -e $ext_net_type -af $ip_addr_family -d "$ovs_dpdk_bridge"); then
       echo -e "${red}ERROR: Failed to generate compute NIC heat template ${reset}"
       exit 1
     fi

diff --git a/tests/test_apex_python_utils_py.py b/tests/test_apex_python_utils_py.py
index 12ac409..1f28035 100644 (file)
--- a/tests/test_apex_python_utils_py.py
+++ b/tests/test_apex_python_utils_py.py
@@ -75,6 +75,5 @@ class TestCommonUtils(object):
         args = self.parser.parse_args(['nic-template',
                                        '-s', net_sets,
                                        '-r', 'compute',
-                                       '-t', nic_template,
-                                       '-n', 'admin_network'])
+                                       '-t', nic_template])
         assert_equal(build_nic_template(args), None)