Merge pull request #2532 from Milisha-Gupta/pub/new_architecture

Changes for nic_name to oim_nic_name

discovery/roles/discovery_validations/common/tasks/assign_network_interface.yml

@@ -22,7 +22,7 @@
   ansible.builtin.set_fact:
     bmc_details_status: true
   when:
-    - network_data.bmc_network.nic_name | default("", true) | length > 0
+    - network_data.bmc_network.oim_nic_name | default("", true) | length > 0
     - network_data.bmc_network.netmask_bits | default("", true) | length > 0
     - network_data.bmc_network.static_range | default("", true) | length > 0
     - network_data.bmc_network.dynamic_range | default("", true) | length > 0
@@ -40,15 +40,15 @@
         network_interface_type: "lom"
       when:
         - bmc_details_status
-        - network_data.admin_network.nic_name == network_data.bmc_network.nic_name
+        - network_data.admin_network.oim_nic_name == network_data.bmc_network.oim_nic_name
 
     - name: Assign Dedicated to network_interface_type
       ansible.builtin.set_fact:
         network_interface_type: "dedicated"
       when:
         - (not bmc_details_status) or
-          (network_data.bmc_network.nic_name | default("", true) | length > 1
-          and network_data.admin_network.nic_name != network_data.bmc_network.nic_name)
+          (network_data.bmc_network.oim_nic_name | default("", true) | length > 1
+          and network_data.admin_network.oim_nic_name != network_data.bmc_network.oim_nic_name)
   rescue:
     - name: Failed to initialize network interface type
       ansible.builtin.fail:

discovery/roles/discovery_validations/common/tasks/validate_admin_nic.yml

@@ -16,7 +16,7 @@
 - name: Validate admin_nic details
   ansible.builtin.assert:
     that:
-      - network_data.admin_network.nic_name | default("", true) | length > 0
+      - network_data.admin_network.oim_nic_name | default("", true) | length > 0
       - network_data.admin_network.netmask_bits | default("", true) | length > 0
       - network_data.admin_network.static_range | default("", true) | length > 0
       - network_data.admin_network.dynamic_range | default("", true) | length > 0
@@ -91,7 +91,7 @@
 - name: Set admin_nic_ip and admin_nic
   ansible.builtin.set_fact:
     admin_nic_ip: "{{ network_data.admin_network.primary_oim_admin_ip }}"
-    admin_nic: "{{ network_data.admin_network.nic_name }}"
+    admin_nic: "{{ network_data.admin_network.oim_nic_name }}"
 
 - name: Ensure NIC exists on the system
   ansible.builtin.assert:

discovery/roles/discovery_validations/common/tasks/validate_bmc_nic.yml

@@ -20,7 +20,7 @@
     - name: Validate bmc_nic details
       ansible.builtin.assert:
         that:
-          - network_data.bmc_network.nic_name | default("", true) | length > 0
+          - network_data.bmc_network.oim_nic_name | default("", true) | length > 0
           - network_data.bmc_network.netmask_bits | default("", true) | length > 0
           - network_data.bmc_network.static_range | default("", true) | length > 0
           - network_data.bmc_network.dynamic_range | default("", true) | length > 0
@@ -194,7 +194,7 @@
     - name: Set bmc_ip
       ansible.builtin.set_fact:
         bmc_nic_ip: "{{ script_output.stdout }}"
-        bmc_nic: "{{ network_data.bmc_network.nic_name }}"
+        bmc_nic: "{{ network_data.bmc_network.oim_nic_name }}"
       when:
         - script_output.rc == 0
 

discovery/roles/discovery_validations/common/vars/main.yml

@@ -79,11 +79,11 @@ repo_config_metadata_fail_msg: "Failed: Cannot change repo_config in subsequent
 # Usage: assign_network_interface.yml
 network_interface_fail_msg: "Failed. Please provide a valid network interface type."
 warning_msg_bmc_network_details_incomplete: "Warning, BMC network details incomplete. BMC discovery and support will be skipped.
-Note: nic_name, netmask_bits, static_range and dynamic_range are mandatory parameters under bmc_network in network_spec.yml for bmc discover"
+Note: oim_nic_name, netmask_bits, static_range and dynamic_range are mandatory parameters under bmc_network in network_spec.yml for bmc discover"
 
 # Usage: validate_admin_nic.yml
 success_msg_admin_nic_details: "Admin nic details validated"
-fail_msg_admin_nic_details: "Failed. Invalid admin_nic details (nic_name, netmask_bits, static_range or dynamic_range) in network_spec file."
+fail_msg_admin_nic_details: "Failed. Invalid admin_nic details (oim_nic_name, netmask_bits, static_range or dynamic_range) in network_spec file."
 fail_msg_admin_netmask_bits: "Failed. Invalid Admin netmask_bits provided in network_spec file."
 success_subnet: "The subnet provided is validated"
 fail_subnet: "Failed. Please provide proper subnet with netmask {{ omnia_admin_netmask }} in provision_config.yml"
@@ -109,7 +109,7 @@ success_msg_bmc_nic_details: "BMC nic details validated"
 bmc_params_success_msg: "Successfully validated bmc network params"
 bmc_params_failure_msg: "Failed. Please provide proper input parameters for bmc network in network_spec file."
 fail_msg_bmc_netmask_bits: "Failed. Invalid BMC netmask_bits provided in network_spec file."
-fail_msg_bmc_nic_details: "Failed. Invalid bmc_network details (nic_name, netmask_bits, static_range or dynamic_range) in network_spec file."
+fail_msg_bmc_nic_details: "Failed. Invalid bmc_network details (oim_nic_name, netmask_bits, static_range or dynamic_range) in network_spec file."
 bmc_nic_start: "{{ bmc_nic_subnet.split('.')[0] + '.' + bmc_nic_subnet.split('.')[1] + '.'
 + pxe_nic_start_range.split('.')[-2] + '.' + pxe_nic_start_range.split('.')[-1] }}"
 bmc_nic_end: "{{ bmc_nic_subnet.split('.')[0] + '.' + bmc_nic_subnet.split('.')[1] + '.'

discovery/roles/discovery_validations/mtms/tasks/validate_bmc_mechanism.yml

@@ -21,7 +21,7 @@
   ansible.builtin.set_fact:
     discovery_mech_bmc: true
   when:
-    - network_data.bmc_network.nic_name | default('', true) | length > 0
+    - network_data.bmc_network.oim_nic_name | default('', true) | length > 0
     - network_data.bmc_network.static_range | length > 0
     - network_data.bmc_network.dynamic_range | length > 0
     - network_data.bmc_network.netmask_bits | int >= 1

discovery/roles/discovery_validations/switch_based/vars/main.yml

@@ -29,6 +29,6 @@ switch_snmp3_password_fail_msg: "Failed. Incorrect switch_snmp3_username or swit
 
 # Usage: validate_bmc_details_status.yml
 bmc_network_details_fail_msg: "Failed. bmc_network details should be provided in network_spec.yml when enable_switch_based is set true.
-nic_name, netmask_bits, static_range and dynamic_range are mandatory parameters under bmc_network in network_spec.yml for switch discovery of nodes"
+oim_nic_name, netmask_bits, static_range and dynamic_range are mandatory parameters under bmc_network in network_spec.yml for switch discovery of nodes"
 bmc_discovery_warning_msg: "[WARNING] bmc discovery will be skipped when enable_switch_based is set true in provision_config.yml.
 Either switch_based discovery or bmc discovery allowed during execution of discovery_provision.yml."

input/network_spec.yml

@@ -1,7 +1,7 @@
 ---
     Networks:
     - admin_network:
-        nic_name: "eno1"
+        oim_nic_name: "eno1"
         netmask_bits: "16"
         primary_oim_admin_ip: "10.5.255.254"
         static_range: "10.5.0.1-10.5.0.200"
@@ -13,7 +13,7 @@
         MTU: "1500"
 
     - bmc_network:
-        nic_name: ""
+        oim_nic_name: ""
         netmask_bits: ""
         static_range: ""
         dynamic_range: ""

input/provision_config.yml

@@ -49,7 +49,7 @@ pxe_mapping_file_path: ""
 # If enable_switch_based is set to true, Following inputs should be provided:
 # switch_based_details should be provided in provision_config.yml
 # switch_snmp3_username and switch_snmp3_password should be provided in provision_config_credentials.yml
-# bmc_network details with nic_name, netmask_bits, static_range and dynamic_range should be provided in network_spec.yml
+# bmc_network details with oim_nic_name, netmask_bits, static_range and dynamic_range should be provided in network_spec.yml
 # Warning: If enable_switch_based is set to true, bmc discovery will be skipped.
 # For enabling bmc discovery, set enable_switch_based to false and provide bmc_network details in network_spec.yml
 # It accepts true and false values

prepare_oim/roles/prepare_oim_validation/tasks/validate_network_spec.yml

@@ -16,7 +16,7 @@
 - name: Set admin network nic and ip
   ansible.builtin.set_fact:
     admin_nic_ip: "{{ network_data.admin_network.primary_oim_admin_ip }}"
-    admin_nic: "{{ network_data.admin_network.nic_name }}"
+    admin_nic: "{{ network_data.admin_network.oim_nic_name }}"
     admin_netmask_bits: "{{ network_data.admin_network.netmask_bits }}"
 
 - name: Ensure NIC exists on the system

shared_libraries/provision/server_spec_update/validate_inventory_file.py

@@ -37,6 +37,7 @@ def validate_inventory(category_list, hostvars):
 
     # Remove localhost from inventory
     hostvars.pop('localhost','none')
+    hostvars.pop('omnia_provision','none')
 
     # Validate hosts in inventory file
     for host, host_data in hostvars.items():

shared_libraries/provision/validation/validate_network_address.py

@@ -47,7 +47,7 @@ def main():
     network_data = json.loads(network_string)
     network_interface = sys.argv[1]
     network_interface_ip = []
-    result = subprocess.run(['ip', 'addr', 'show', network_data[network_interface]["nic_name"]], capture_output=True, text=True, check=True)
+    result = subprocess.run(['ip', 'addr', 'show', network_data[network_interface]["oim_nic_name"]], capture_output=True, text=True, check=True)
     for ip in result.stdout.split("inet ")[1:]:
         network_interface_ip.append(ip.split()[0])