Merge "Adds ability to power off nodes in clean"

[apex.git] / lib / python / apex_python_utils.py

diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index 829b3a0..1f5e407 100755 (executable)
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -7,6 +7,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
+import apex
 import argparse
 import sys
 import logging
@@ -61,6 +62,10 @@ def parse_deploy_settings(args):
     settings.dump_bash()
 
 
+def run_clean(args):
+    apex.clean_nodes(args.file)
+
+
 def find_ip(args):
     """
     Get and print the IP from a specific interface
@@ -95,19 +100,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 +179,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'],
@@ -195,6 +197,12 @@ def get_parser():
                                  help='path to deploy settings file')
     deploy_settings.set_defaults(func=parse_deploy_settings)
 
+    clean = subparsers.add_parser('clean',
+                                  help='Parse deploy settings file')
+    clean.add_argument('-f', '--file',
+                       help='path to inventory file')
+    clean.set_defaults(func=run_clean)
+
     return parser