fixup! feat(oracle): allow for specifying network configuration

Author: a-dubs

pycloudlib/oci/cloud.py

@@ -350,9 +350,9 @@ def find_compatible_subnet(self, networking_config: NetworkingConfig) -> str:
             `PycloudlibError` if unable to determine `subnet_id` for the given `networking_config`
         """
         subnet_id = get_subnet_id(
-            self.network_client,
-            self.compartment_id,
-            self.availability_domain,
+            network_client=self.network_client,
+            compartment_id=self.compartment_id,
+            availability_domain=self.availability_domain,
             vcn_name=self.vcn_name,
             networking_config=networking_config,
         )

pycloudlib/oci/instance.py

@@ -285,6 +285,9 @@ def add_network_interface(
                 found.
             subnet_name: Name of the subnet to add the NIC to. If provided, this subnet will
                 blindly be selected and networking_config will be ignored.
+
+        Returns:
+            str: The private IP address of the added network interface.
         """
         if subnet_name:
             if networking_config:
@@ -321,13 +324,25 @@ def add_network_interface(
             "Newly attached vnic data:\n%s",
             vnic_data,
         )
+        try:
+            new_ip = vnic_data.private_ip or vnic_data.ipv6_addresses[0]
+        except IndexError:
+            err_msg = (
+                "Unexpected error occurred when trying to retrieve local IP address of the "
+                "newly attached NIC. No private IP or IPv6 address found."
+            )
+            self._log.error(
+                err_msg + "Full vnic data for debugging purposes:\n%s",
+                vnic_data,
+            )
+            raise PycloudlibError(err_msg)
         self._log.info(
             "Added network interface with IP %s to instance %s on nic #%s",
-            vnic_data.private_ip or vnic_data.ipv6_addresses[0],
+            new_ip,
             self.instance_id,
             nic_index,
         )
-        return vnic_data.private_ip or vnic_data.ipv6_addresses[0]
+        return new_ip
 
     def remove_network_interface(self, ip_address: str):
         """Remove network interface based on IP address.

pycloudlib/oci/utils.py

@@ -149,8 +149,7 @@ def _subnet_is_compatible(
     From the networking_config, we have the following restrictions:
 
     private:
-    - if private is true, then `prohibit_internet_ingress` must be True
-    - if false (public), then `prohibit_internet_ingress` must be False
+    - the subnet must match the given privacy setting
 
     networking_type:
     - if None or AUTO, then the subnet is compatible
@@ -234,12 +233,12 @@ def get_subnet_id(
     Returns:
         id of the subnet selected
     Raises:
-        `PycloudlibError` if unable to determine `subnet_id` for `availability_domain`,
+        `PycloudlibError` if unable to determine `subnet_id` for `availabilitjy_domain`,
         or if no relevant VCNs are found in the compartment.
     """
     if not networking_config:
         networking_config = NetworkingConfig()
-        log.debug(
+        log.warning(
             "No networking config provided. Using default networking config of "
             "networking_type: %s, private: %s",
             networking_config.networking_type,

tests/integration_tests/oracle/test_utils.py

@@ -23,7 +23,7 @@ def oci_cloud():
         yield oracle_cloud
 
 
-# @a-dubs - These are pre-existing subnets that I have created in my Oracle Cloud account.
+# These are pre-existing subnets that I have created in my Oracle Cloud account.
 # this is not immediately reproducible by others, but all they need to do is create 3 subnets
 # that match the below configurations and update the following variables with the new subnet ids.
 # This is the only way I could feel confident that my subnet selection logic is working with the

tests/unit_tests/oci/test_utils.py

@@ -538,59 +538,56 @@ def test_get_subnet_id_parameterized(
 
 
 class TestGenerateCreateVnicDetails:
+    subnet_id = "subnet_id"
+
     def test_generate_create_vnic_details_default(self):
         """Test generate_create_vnic_details with default parameters."""
-        subnet_id = "subnet_id"
-        vnic_details = generate_create_vnic_details(subnet_id)
-        assert vnic_details.subnet_id == subnet_id
+
+        vnic_details = generate_create_vnic_details(self.subnet_id)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is False
         assert vnic_details.assign_public_ip is True
 
     def test_generate_create_vnic_details_ipv4_public(self):
         """Test generate_create_vnic_details with IPv4 public configuration."""
-        subnet_id = "subnet_id"
         networking_config = NetworkingConfig(networking_type=NetworkingType.IPV4, private=False)
-        vnic_details = generate_create_vnic_details(subnet_id, networking_config)
-        assert vnic_details.subnet_id == subnet_id
+        vnic_details = generate_create_vnic_details(self.subnet_id, networking_config)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is False
         assert vnic_details.assign_public_ip is True
 
     def test_generate_create_vnic_details_ipv4_private(self):
         """Test generate_create_vnic_details with IPv4 private configuration."""
-        subnet_id = "subnet_id"
         networking_config = NetworkingConfig(networking_type=NetworkingType.IPV4, private=True)
-        vnic_details = generate_create_vnic_details(subnet_id, networking_config)
-        assert vnic_details.subnet_id == subnet_id
+        vnic_details = generate_create_vnic_details(self.subnet_id, networking_config)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is False
         assert vnic_details.assign_public_ip is False
 
     def test_generate_create_vnic_details_ipv6(self):
         """Test generate_create_vnic_details with IPv6 configuration."""
-        subnet_id = "subnet_id"
         networking_config = NetworkingConfig(networking_type=NetworkingType.IPV6)
-        vnic_details = generate_create_vnic_details(subnet_id, networking_config)
-        assert vnic_details.subnet_id == subnet_id
+        vnic_details = generate_create_vnic_details(self.subnet_id, networking_config)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is True
         assert vnic_details.assign_public_ip is False
 
     def test_generate_create_vnic_details_dual_stack_public(self):
         """Test generate_create_vnic_details with dual stack public configuration."""
-        subnet_id = "subnet_id"
         networking_config = NetworkingConfig(
             networking_type=NetworkingType.DUAL_STACK, private=False
         )
-        vnic_details = generate_create_vnic_details(subnet_id, networking_config)
-        assert vnic_details.subnet_id == subnet_id
+        vnic_details = generate_create_vnic_details(self.subnet_id, networking_config)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is True
         assert vnic_details.assign_public_ip is True
 
     def test_generate_create_vnic_details_dual_stack_private(self):
         """Test generate_create_vnic_details with dual stack private configuration."""
-        subnet_id = "subnet_id"
         networking_config = NetworkingConfig(
             networking_type=NetworkingType.DUAL_STACK, private=True
         )
-        vnic_details = generate_create_vnic_details(subnet_id, networking_config)
-        assert vnic_details.subnet_id == subnet_id
+        vnic_details = generate_create_vnic_details(self.subnet_id, networking_config)
+        assert vnic_details.subnet_id == self.subnet_id
         assert vnic_details.assign_ipv6_ip is True
         assert vnic_details.assign_public_ip is False