fix nxos_interface_ospf issues (#35988) (#36090)

* fix nxos_interface_ospf issues

* review comment

(cherry picked from commit eab1b62)

lib/ansible/modules/network/nxos/nxos_interface_ospf.py

@@ -95,16 +95,16 @@
   message_digest_algorithm_type:
     description:
       - Algorithm used for authentication among neighboring routers
-        within an area. Valid values is 'md5'.
+        within an area. Valid values are 'md5' and 'default'.
     required: false
-    choices: ['md5']
+    choices: ['md5', 'default']
     default: null
   message_digest_encryption_type:
     description:
       - Specifies the scheme used for encrypting message_digest_password.
-        Valid values are '3des' or 'cisco_type_7' encryption.
+        Valid values are '3des' or 'cisco_type_7' encryption or 'default'.
     required: false
-    choices: ['cisco_type_7','3des']
+    choices: ['cisco_type_7','3des', 'default']
     default: null
   message_digest_password:
     description:
@@ -137,6 +137,8 @@
 
 
 import re
+import struct
+import socket
 from ansible.module_utils.network.nxos.nxos import get_config, load_config
 from ansible.module_utils.network.nxos.nxos import nxos_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
@@ -175,6 +177,7 @@ def get_value(arg, config, module):
                 value = value_list[0]
             elif arg == 'area':
                 value = value_list[2]
+                value = normalize_area(value, module)
     elif command == 'ip ospf message-digest-key':
         value = ''
         if has_command_val:
@@ -359,7 +362,7 @@ def state_absent(module, existing, proposed, candidate):
 def normalize_area(area, module):
     try:
         area = int(area)
-        area = '0.0.0.{0}'.format(area)
+        area = socket.inet_ntoa(struct.pack('!L', area))
     except ValueError:
         splitted_area = area.split('.')
         if len(splitted_area) != 4:
@@ -378,8 +381,8 @@ def main():
         passive_interface=dict(required=False, type='bool'),
         message_digest=dict(required=False, type='bool'),
         message_digest_key_id=dict(required=False, type='str'),
-        message_digest_algorithm_type=dict(required=False, type='str', choices=['md5']),
-        message_digest_encryption_type=dict(required=False, type='str', choices=['cisco_type_7', '3des']),
+        message_digest_algorithm_type=dict(required=False, type='str', choices=['md5', 'default']),
+        message_digest_encryption_type=dict(required=False, type='str', choices=['cisco_type_7', '3des', 'default']),
         message_digest_password=dict(required=False, type='str', no_log=True),
         state=dict(choices=['present', 'absent'], default='present', required=False)
     )
@@ -411,7 +414,7 @@ def main():
     for param in ['message_digest_encryption_type',
                   'message_digest_algorithm_type',
                   'message_digest_password']:
-        if module.params[param] == 'default':
+        if module.params[param] == 'default' and module.params['message_digest_key_id'] != 'default':
             module.exit_json(msg='Use message_digest_key_id=default to remove an existing authentication configuration')
 
     state = module.params['state']
@@ -434,6 +437,8 @@ def main():
                 proposed[key] = value
 
     proposed['area'] = normalize_area(proposed['area'], module)
+    if 'hello_interval' in proposed and proposed['hello_interval'] == '10':
+        proposed['hello_interval'] = 'default'
 
     candidate = CustomNetworkConfig(indent=3)
     if state == 'present':

test/integration/targets/nxos_interface_ospf/tests/common/sanity.yaml

@@ -50,7 +50,7 @@
     nxos_interface_ospf: &configure
       interface: "{{ nxos_int1|upper }}"
       ospf: 1
-      area: 1
+      area: 12345678
       cost: 55
       passive_interface: true
       hello_interval: 15
@@ -75,7 +75,7 @@
     nxos_interface_ospf: &modify
       interface: "{{ testint }}"
       ospf: 1
-      area: 1
+      area: 12345678
       cost: 66
       passive_interface: false
       hello_interval: 17
@@ -92,6 +92,70 @@
 
   - assert: *false
 
+  - name: default properties
+    nxos_interface_ospf: &def
+      interface: "{{ testint }}"
+      ospf: 1
+      area: 12345678
+      cost: default
+      hello_interval: 10
+      dead_interval: default
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence"
+    nxos_interface_ospf: *def
+    register: result
+
+  - assert: *false
+
+  - name: Message_digest properties
+    nxos_interface_ospf: &md
+      interface: "{{ testint }}"
+      ospf: 1
+      area: 12345678
+      message_digest: True
+      message_digest_key_id: 10
+      message_digest_algorithm_type: md5
+      message_digest_encryption_type: 3des
+      message_digest_password: b69f7bc54725b1bfd1ea93afa7b09400
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence"
+    nxos_interface_ospf: *md
+    register: result
+
+  - assert: *false
+
+  - name: Message_digest defaults
+    nxos_interface_ospf: &mdd
+      interface: "{{ testint }}"
+      ospf: 1
+      area: 12345678
+      message_digest: False
+      message_digest_key_id: default
+      message_digest_algorithm_type: default
+      message_digest_encryption_type: default
+      message_digest_password: default
+      state: present
+      provider: "{{ connection }}"
+    register: result
+
+  - assert: *true
+
+  - name: "Check Idempotence"
+    nxos_interface_ospf: *mdd
+    register: result
+
+  - assert: *false
+
   - name: create port-channel and loopback interfaces
     nxos_config:
       commands:
@@ -117,7 +181,7 @@
     nxos_interface_ospf: &configurepc
       interface: Port-channel10
       ospf: 1
-      area: 1
+      area: 429496729
       cost: 55
       passive_interface: true
       hello_interval: 15
@@ -138,7 +202,7 @@
     nxos_interface_ospf: &configurepclower
       interface: port-channel11
       ospf: 1
-      area: 1
+      area: 42949672
       cost: 55
       passive_interface: true
       hello_interval: 15
@@ -159,7 +223,7 @@
     nxos_interface_ospf: &configurelb
       interface: LOOPBACK55
       ospf: 1
-      area: 1
+      area: 4.4.4.4
       cost: 55
       hello_interval: 15
       dead_interval: 75
@@ -179,7 +243,7 @@
     nxos_interface_ospf: &configurelblower
       interface: loopback77
       ospf: 1
-      area: 1
+      area: 429496
       cost: 77
       hello_interval: 45
       dead_interval: 75
@@ -199,7 +263,7 @@
     nxos_interface_ospf: &removeconfig
       interface: "{{ testint }}"
       ospf: 1
-      area: 1
+      area: 12345678
       cost: 55
       passive_interface: true
       hello_interval: 15