new: add vpc fields to ip_info (#434)

* Bump types-requests from 2.31.0.2 to 2.31.0.10 (#431) Bumps [types-requests](https://github.com/python/typeshed) from 2.31.0.2 to 2.31.0.10. - [Commits](https://github.com/python/typeshed/commits) --- updated-dependencies: - dependency-name: types-requests dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * make deps upgrade (#432) * adding vpc fields * Explicitly handle none values for testing CA (#435) * merging to fix errors * adding tests for ip_info --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Lena Garber <114949949+lgarber-akamai@users.noreply.github.com>
linode · Nov 13, 2023 · 5a81b5d · 5a81b5d
1 parent d98a9b8
commit 5a81b5d
Show file tree

Hide file tree

Showing 75 changed files with 141 additions and 91 deletions.
diff --git a/Makefile b/Makefile
@@ -27,7 +27,7 @@ install: build
 	ansible-galaxy collection install *.tar.gz --force -p $(COLLECTIONS_PATH)
 
 deps:
-	pip install --upgrade -r requirements.txt -r requirements-dev.txt
+	pip install -r requirements.txt -r requirements-dev.txt --upgrade
 
 lint:
 	pylint plugins

diff --git a/docs/modules/ip_info.md b/docs/modules/ip_info.md
@@ -36,7 +36,12 @@ Get info about a Linode IP.
           "rdns": "test.example.org",
           "region": "us-east",
           "subnet_mask": "255.255.255.0",
-          "type": "ipv4"
+          "type": "ipv4",
+          "vpc_nat_1_1": {
+            "vpc_id": 242,
+            "subnet_id": 194,
+            "address": "139.144.244.36",
+          }
         }
         ```
     - See the [Linode API response documentation](https://www.linode.com/docs/api/networking/#ip-address-view__responses) for a list of returned fields

diff --git a/docs/modules/ip_rdns.md b/docs/modules/ip_rdns.md
@@ -49,7 +49,12 @@ Manage a Linode IP address's rDNS.
           "rdns": "test.example.org",
           "region": "us-east",
           "subnet_mask": "255.255.255.0",
-          "type": "ipv4"
+          "type": "ipv4",
+          "vpc_nat_1_1": {
+            "vpc_id": 242,
+            "subnet_id": 194,
+            "address": "139.144.244.36",
+          }
         }
         ```
     - See the [Linode API response documentation](https://www.linode.com/docs/api/profile/#ip-address-rdns-update) for a list of returned fields

diff --git a/plugins/module_utils/doc_fragments/ip_info.py b/plugins/module_utils/doc_fragments/ip_info.py
@@ -14,5 +14,10 @@
   "rdns": "test.example.org",
   "region": "us-east",
   "subnet_mask": "255.255.255.0",
-  "type": "ipv4"
+  "type": "ipv4",
+  "vpc_nat_1_1": {
+    "vpc_id": 242,
+    "subnet_id": 194,
+    "address": "139.144.244.36",
+  }
 }''']
diff --git a/plugins/modules/ip_info.py b/plugins/modules/ip_info.py
@@ -3,6 +3,7 @@
 
 """This module allows users to retrieve information about a Linode IP address."""
 
+
 from __future__ import absolute_import, division, print_function
 
 from typing import Any, Optional
@@ -70,15 +71,14 @@ def __init__(self) -> None:
     def _get_ip(self, address: str) -> IPAddress:
         try:
             ip_addr = IPAddress(self.client, address)
-
             ip_addr._api_get()
-
             return ip_addr
         except Exception as exception:
             self.fail(
                 msg="failed to get IP address {0}: {1}".format(
                     address, exception
-                )
+                ),
+                exception=exception,
             )
 
     def exec_module(self, **kwargs: Any) -> Optional[dict]:

diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@
 # linode-api4>=5.9.0
 git+https://github.com/linode/linode_api4-python@proj/vpc
 polling>=0.3.2
-types-requests==2.31.0.2
+types-requests==2.31.0.10
 ansible-specdoc>=0.0.14
diff --git a/tests/integration/targets/api_request_basic/tasks/main.yaml b/tests/integration/targets/api_request_basic/tasks/main.yaml
@@ -63,4 +63,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/api_request_extra/tasks/main.yaml b/tests/integration/targets/api_request_extra/tasks/main.yaml
@@ -48,4 +48,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/database_engine_list/tasks/main.yaml b/tests/integration/targets/database_engine_list/tasks/main.yaml
@@ -25,4 +25,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/domain_basic/tasks/main.yaml b/tests/integration/targets/domain_basic/tasks/main.yaml
@@ -95,4 +95,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/domain_list/tasks/main.yaml b/tests/integration/targets/domain_list/tasks/main.yaml
@@ -72,4 +72,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/domain_record/tasks/main.yaml b/tests/integration/targets/domain_record/tasks/main.yaml
@@ -245,4 +245,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/domain_zone_file/tasks/main.yaml b/tests/integration/targets/domain_zone_file/tasks/main.yaml
@@ -60,4 +60,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/event_list/tasks/main.yaml b/tests/integration/targets/event_list/tasks/main.yaml
@@ -43,4 +43,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/firewall_basic/tasks/main.yaml b/tests/integration/targets/firewall_basic/tasks/main.yaml
@@ -283,4 +283,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/firewall_device/tasks/main.yaml b/tests/integration/targets/firewall_device/tasks/main.yaml
@@ -102,6 +102,6 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
 
 
diff --git a/tests/integration/targets/firewall_icmp/tasks/main.yaml b/tests/integration/targets/firewall_icmp/tasks/main.yaml
@@ -91,4 +91,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/firewall_list/tasks/main.yaml b/tests/integration/targets/firewall_list/tasks/main.yaml
@@ -64,4 +64,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/firewall_update/tasks/main.yaml b/tests/integration/targets/firewall_update/tasks/main.yaml
@@ -887,4 +887,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/image_basic/tasks/main.yaml b/tests/integration/targets/image_basic/tasks/main.yaml
@@ -94,4 +94,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/image_list/tasks/main.yaml b/tests/integration/targets/image_list/tasks/main.yaml
@@ -43,4 +43,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/image_upload/tasks/main.yaml b/tests/integration/targets/image_upload/tasks/main.yaml
@@ -39,4 +39,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/instance_backup_enabled/tasks/main.yaml b/tests/integration/targets/instance_backup_enabled/tasks/main.yaml
@@ -98,4 +98,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/instance_basic/tasks/main.yaml b/tests/integration/targets/instance_basic/tasks/main.yaml
@@ -156,4 +156,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/instance_booted/tasks/main.yaml b/tests/integration/targets/instance_booted/tasks/main.yaml
@@ -59,4 +59,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/instance_config_disk/tasks/main.yaml b/tests/integration/targets/instance_config_disk/tasks/main.yaml
@@ -224,4 +224,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/instance_config_vlan/tasks/main.yaml b/tests/integration/targets/instance_config_vlan/tasks/main.yaml
@@ -113,4 +113,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/instance_config_vpc/tasks/main.yaml b/tests/integration/targets/instance_config_vpc/tasks/main.yaml
@@ -6,7 +6,7 @@
     - name: Create a VPC
       linode.cloud.vpc:
         label: 'ansible-test-{{ r }}'
-        region: us-east
+        region: us-mia
         description: test description
         state: present
       register: create_vpc
@@ -22,7 +22,7 @@
     - name: Create a Linode instance with interface
       linode.cloud.instance:
         label: 'ansible-test-{{ r }}'
-        region: us-east
+        region: us-mia
         type: g6-standard-1
         disks:
           - label: test-disk
@@ -58,10 +58,23 @@
           - create_instance.configs[0].interfaces[0].ipv4.nat_1_1 == create_instance.instance.ipv4[0]
           - create_instance.configs[0].interfaces[0].ipv4.vpc == '10.0.0.3'
 
+    - name: Get ip_info about the instance's vpc ip
+      linode.cloud.ip_info:
+        address: '{{ create_instance.instance.ipv4[0] }}'
+      register: ip_info
+
+    - name: Assert ip_info matches vpc settings
+      assert:
+        that:
+          - ip_info.ip.address == create_instance.instance.ipv4[0]
+          - ip_info.ip.vpc_nat_1_1.address == '10.0.0.3'
+          - ip_info.ip.vpc_nat_1_1.vpc_id == create_vpc.vpc.id
+          - ip_info.ip.vpc_nat_1_1.subnet_id == create_subnet.subnet.id
+
     - name: Update the config interfaces
       linode.cloud.instance:
         label: 'ansible-test-{{ r }}'
-        region: us-east
+        region: us-mia
         type: g6-standard-1
         disks:
           - label: test-disk
@@ -103,7 +116,7 @@
     - name: Don't change the config interfaces
       linode.cloud.instance:
         label: 'ansible-test-{{ r }}'
-        region: us-east
+        region: us-mia
         type: g6-standard-1
         disks:
           - label: test-disk
@@ -158,4 +171,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    REQUESTS_CA_BUNDLE: '{{ ca_file }}'
+    REQUESTS_CA_BUNDLE: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/instance_interfaces/tasks/main.yaml b/tests/integration/targets/instance_interfaces/tasks/main.yaml
@@ -89,8 +89,6 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-<<<<<<< HEAD
-=======
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
 
 >>>>>>> 3ee3aabf6b1a20187f78b4f2371ab8902cc76b7e
diff --git a/tests/integration/targets/instance_list/tasks/main.yaml b/tests/integration/targets/instance_list/tasks/main.yaml
@@ -63,4 +63,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/instance_metadata/tasks/main.yaml b/tests/integration/targets/instance_metadata/tasks/main.yaml
@@ -41,4 +41,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/instance_reboot/tasks/main.yaml b/tests/integration/targets/instance_reboot/tasks/main.yaml
@@ -55,4 +55,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/instance_timeout/tasks/main.yaml b/tests/integration/targets/instance_timeout/tasks/main.yaml
@@ -27,5 +27,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
 
diff --git a/tests/integration/targets/instance_type_list/tasks/main.yaml b/tests/integration/targets/instance_type_list/tasks/main.yaml
@@ -26,4 +26,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/ip_assign/tasks/main.yml b/tests/integration/targets/ip_assign/tasks/main.yml
@@ -61,6 +61,6 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
 
 
diff --git a/tests/integration/targets/ip_info/tasks/main.yaml b/tests/integration/targets/ip_info/tasks/main.yaml
@@ -34,4 +34,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/ip_rdns/tasks/main.yaml b/tests/integration/targets/ip_rdns/tasks/main.yaml
@@ -52,4 +52,6 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
+
diff --git a/tests/integration/targets/ip_share/tasks/main.yaml b/tests/integration/targets/ip_share/tasks/main.yaml
@@ -93,4 +93,4 @@
     LINODE_UA_PREFIX: '{{ ua_prefix }}'
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/ipv6_range_info/tasks/main.yaml b/tests/integration/targets/ipv6_range_info/tasks/main.yaml
@@ -53,4 +53,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/lke_cluster_basic/tasks/main.yaml b/tests/integration/targets/lke_cluster_basic/tasks/main.yaml
@@ -149,4 +149,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/lke_cluster_info_ro/tasks/main.yaml b/tests/integration/targets/lke_cluster_info_ro/tasks/main.yaml
@@ -67,4 +67,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/lke_node_pool_basic/tasks/main.yaml b/tests/integration/targets/lke_node_pool_basic/tasks/main.yaml
@@ -98,5 +98,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
 
diff --git a/tests/integration/targets/lke_version_list/tasks/main.yaml b/tests/integration/targets/lke_version_list/tasks/main.yaml
@@ -13,4 +13,5 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
+
diff --git a/tests/integration/targets/mysql_basic/tasks/main.yaml b/tests/integration/targets/mysql_basic/tasks/main.yaml
@@ -137,4 +137,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'
diff --git a/tests/integration/targets/mysql_complex/tasks/main.yaml b/tests/integration/targets/mysql_complex/tasks/main.yaml
@@ -84,4 +84,4 @@
     LINODE_API_TOKEN: '{{ api_token }}'
     LINODE_API_URL: '{{ api_url }}'
     LINODE_API_VERSION: '{{ api_version }}'
-    LINODE_CA: '{{ ca_file }}'
+    LINODE_CA: '{{ ca_file or "" }}'