From 3b83e676e62664ae8f45f03ecad612c15e4397fd Mon Sep 17 00:00:00 2001 From: Jason Edelman Date: Fri, 26 Aug 2016 13:27:26 -0400 Subject: [PATCH] removed feature check for nxos_interface --- .../modules/network/nxos/nxos_interface.py | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/lib/ansible/modules/network/nxos/nxos_interface.py b/lib/ansible/modules/network/nxos/nxos_interface.py index 46b9f4ef8e4..412895e19b3 100644 --- a/lib/ansible/modules/network/nxos/nxos_interface.py +++ b/lib/ansible/modules/network/nxos/nxos_interface.py @@ -157,33 +157,6 @@ def is_default_interface(interface, module): return 'DNE' -def get_available_features(feature, module): - available_features = {} - command = 'show feature' - body = execute_show_command(command, module) - - try: - body = body[0]['TABLE_cfcFeatureCtrlTable']['ROW_cfcFeatureCtrlTable'] - except (TypeError, IndexError): - return available_features - - for each_feature in body: - feature = each_feature['cfcFeatureCtrlName2'] - state = each_feature['cfcFeatureCtrlOpStatus2'] - - if 'enabled' in state: - state = 'enabled' - - if feature not in available_features.keys(): - available_features[feature] = state - else: - if (available_features[feature] == 'disabled' and - state == 'enabled'): - available_features[feature] = state - - return available_features - - def get_interface_type(interface): """Gets the type of interface @@ -626,15 +599,6 @@ def main(): if normalized_interface == 'Vlan1' and state == 'absent': module.fail_json(msg='ERROR: CANNOT REMOVE VLAN 1!') - if intf_type == 'svi': - feature = 'interface-vlan' - available_features = get_available_features(feature, module) - svi_state = available_features[feature] - if svi_state == 'disabled': - module.fail_json( - msg='SVI (interface-vlan) feature needs to be enabled first', - ) - if intf_type == 'unknown': module.fail_json( msg='unknown interface type found-1',