solving merge conflicts

Author: Shiva Shankar Vaddepally

plugins/module_utils/nitro_resource_map.py

@@ -28998,7 +28998,15 @@
         ],
     },
     "gslbservicegroup_gslbservicegroupmember_binding": {
-        "_supported_operations": ["add", "count", "delete", "get-all", "get-byname"],
+        "_supported_operations": [
+            "add",
+            "count",
+            "delete",
+            "disable",
+            "enable",
+            "get-all",
+            "get-byname",
+        ],
         "action_payload_keys": {
             "apply": [],
             "create": [],
@@ -29019,6 +29027,7 @@
             "servername",
             "servicegroupname",
             "siteprefix",
+            "state",
             "weight",
         ],
         "bindprimary_key": "ip",
@@ -29036,6 +29045,7 @@
             "servername",
             "servicegroupname",
             "siteprefix",
+            "state",
             "weight",
         ],
         "password_keys": [],
@@ -29051,6 +29061,11 @@
             "servername": {"no_log": False, "type": "str"},
             "servicegroupname": {"no_log": False, "type": "str"},
             "siteprefix": {"no_log": False, "type": "str"},
+            "state": {
+                "choices": ["DISABLED", "ENABLED"],
+                "no_log": False,
+                "type": "str",
+            },
             "weight": {"no_log": False, "type": "int"},
         },
         "singleton": False,
@@ -50526,7 +50541,15 @@
         "update_payload_keys": [],
     },
     "servicegroup_servicegroupmember_binding": {
-        "_supported_operations": ["add", "count", "delete", "get-all", "get-byname"],
+        "_supported_operations": [
+            "add",
+            "count",
+            "delete",
+            "disable",
+            "enable",
+            "get-all",
+            "get-byname",
+        ],
         "action_payload_keys": {
             "apply": [],
             "create": [],
@@ -50549,6 +50572,7 @@
             "servername",
             "servicegroupname",
             "servicegroupname",
+            "state",
             "weight",
         ],
         "bindprimary_key": "ip",
@@ -50567,6 +50591,7 @@
             "serverid",
             "servername",
             "servicegroupname",
+            "state",
             "weight",
         ],
         "password_keys": [],
@@ -50583,6 +50608,11 @@
             "serverid": {"no_log": False, "type": "int"},
             "servername": {"no_log": False, "type": "str"},
             "servicegroupname": {"no_log": False, "type": "str"},
+            "state": {
+                "choices": ["DISABLED", "ENABLED"],
+                "no_log": False,
+                "type": "str",
+            },
             "weight": {"no_log": False, "type": "int"},
         },
         "singleton": False,

plugins/modules/gslbservicegroup_gslbservicegroupmember_binding.py

@@ -32,13 +32,17 @@
     choices:
       - present
       - absent
+      - enabled
+      - disabled
     default: present
     description:
       - The state of the resource being configured by the module on the NetScaler
         ADC node.
       - When C(present), the resource will be added/updated configured according to
         the module's parameters.
       - When C(absent), the resource will be deleted from the NetScaler ADC node.
+      - When C(enabled), the resource will be enabled on the NetScaler ADC node.
+      - When C(disabled), the resource will be disabled on the NetScaler ADC node.
     type: str
   hashid:
     type: int

plugins/modules/servicegroup_servicegroupmember_binding.py

@@ -32,13 +32,17 @@
     choices:
       - present
       - absent
+      - enabled
+      - disabled
     default: present
     description:
       - The state of the resource being configured by the module on the NetScaler
         ADC node.
       - When C(present), the resource will be added/updated configured according to
         the module's parameters.
       - When C(absent), the resource will be deleted from the NetScaler ADC node.
+      - When C(enabled), the resource will be enabled on the NetScaler ADC node.
+      - When C(disabled), the resource will be disabled on the NetScaler ADC node.
     type: str
   customserverid:
     type: str