Merge pull request #1369 from rackerlabs/netapp-define

fix(netapp): do not fail if some resources exist on the NetApp

Author: cardoe

python/understack-workflows/tests/test_netapp_client.py

@@ -323,7 +323,7 @@ def test_create_ip_interface_success(self, mock_interface_class, netapp_client):
             broadcast_domain_name="test-domain",
         )
 
-        result = netapp_client.create_ip_interface(interface_spec)
+        result = netapp_client.get_or_create_ip_interface(interface_spec)
 
         assert isinstance(result, InterfaceResult)
         assert result.name == "test-interface"
@@ -362,14 +362,15 @@ def test_create_ip_interface_failure(self, mock_interface_class, netapp_client):
         )
 
         with pytest.raises(NetworkOperationError):
-            netapp_client.create_ip_interface(interface_spec)
+            netapp_client.get_or_create_ip_interface(interface_spec)
 
     @patch("understack_workflows.netapp.client.Port")
     def test_create_port_success(self, mock_port_class, netapp_client):
         """Test successful port creation."""
         mock_port_instance = MagicMock()
         mock_port_instance.uuid = "port-uuid-123"
         mock_port_instance.name = "e4a-100"
+        mock_port_class.get_collection.return_value = iter([])
         mock_port_class.return_value = mock_port_instance
 
         port_spec = PortSpec(
@@ -379,7 +380,7 @@ def test_create_port_success(self, mock_port_class, netapp_client):
             broadcast_domain_name="test-domain",
         )
 
-        result = netapp_client.create_port(port_spec)
+        result = netapp_client.get_or_create_port(port_spec)
 
         assert isinstance(result, PortResult)
         assert result.uuid == "port-uuid-123"
@@ -390,10 +391,37 @@ def test_create_port_success(self, mock_port_class, netapp_client):
         mock_port_instance.post.assert_called_once_with(hydrate=True)
 
     @patch("understack_workflows.netapp.client.Port")
-    def test_create_port_failure(self, mock_port_class, netapp_client):
+    def test_get_port_success(self, mock_port_class, netapp_client):
+        """Test successful port creation."""
+        mock_port_instance = MagicMock()
+        mock_port_instance.uuid = "port-uuid-123"
+        mock_port_instance.name = "e4a-100"
+        mock_port_class.get_collection.return_value = iter(mock_port_instance)
+        mock_port_class.return_value = mock_port_instance
+
+        port_spec = PortSpec(
+            node_name="node-01",
+            vlan_id=100,
+            base_port_name="e4a",
+            broadcast_domain_name="test-domain",
+        )
+
+        result = netapp_client.get_or_create_port(port_spec)
+
+        assert isinstance(result, PortResult)
+        assert result.uuid == "port-uuid-123"
+        assert result.name == "e4a-100"
+        assert result.node_name == "node-01"
+        assert result.port_type == "vlan"
+
+        mock_port_instance.post.assert_called_once_with(hydrate=True)
+
+    @patch("understack_workflows.netapp.client.Port")
+    def test_get_or_create_port_failure(self, mock_port_class, netapp_client):
         """Test port creation failure."""
         mock_port_instance = MagicMock()
         mock_port_instance.post.side_effect = NetAppRestError("Port creation failed")
+        mock_port_class.get_collection.return_value = iter([])
         mock_port_class.return_value = mock_port_instance
 
         # Configure mock error handler to raise the expected exception
@@ -409,7 +437,7 @@ def test_create_port_failure(self, mock_port_class, netapp_client):
         )
 
         with pytest.raises(NetworkOperationError):
-            netapp_client.create_port(port_spec)
+            netapp_client.get_or_create_port(port_spec)
 
     @patch("understack_workflows.netapp.client.Node")
     def test_get_nodes_success(self, mock_node_class, netapp_client):
@@ -715,8 +743,8 @@ def test_interface_methods_are_abstract(self):
             "create_volume",
             "delete_volume",
             "find_volume",
-            "create_ip_interface",
-            "create_port",
+            "get_or_create_ip_interface",
+            "get_or_create_port",
             "get_nodes",
             "get_namespaces",
             "create_route",

python/understack-workflows/tests/test_netapp_lif_service.py

@@ -60,7 +60,7 @@ def test_create_lif_success(
         mock_port = PortResult(
             uuid="port-uuid-123", name="e4a-100", node_name="node-01", port_type="vlan"
         )
-        mock_client.create_port.return_value = mock_port
+        mock_client.get_or_create_port.return_value = mock_port
 
         # Mock interface creation
         mock_interface = InterfaceResult(
@@ -71,7 +71,7 @@ def test_create_lif_success(
             enabled=True,
             svm_name=expected_svm_name,
         )
-        mock_client.create_ip_interface.return_value = mock_interface
+        mock_client.get_or_create_ip_interface.return_value = mock_interface
 
         # Mock node identification
         mock_node = NodeResult(name="node-01", uuid="node-uuid-1")
@@ -83,15 +83,15 @@ def test_create_lif_success(
         mock_client.find_svm.assert_called_once_with(expected_svm_name)
 
         # Verify port was created
-        mock_client.create_port.assert_called_once()
-        port_call_args = mock_client.create_port.call_args[0][0]
+        mock_client.get_or_create_port.assert_called_once()
+        port_call_args = mock_client.get_or_create_port.call_args[0][0]
         assert isinstance(port_call_args, PortSpec)
         assert port_call_args.node_name == "node-01"
         assert port_call_args.vlan_id == 100
 
         # Verify interface was created
-        mock_client.create_ip_interface.assert_called_once()
-        interface_call_args = mock_client.create_ip_interface.call_args[0][0]
+        mock_client.get_or_create_ip_interface.assert_called_once()
+        interface_call_args = mock_client.get_or_create_ip_interface.call_args[0][0]
         assert isinstance(interface_call_args, InterfaceSpec)
         assert interface_call_args.name == sample_config.name
         assert interface_call_args.svm_name == expected_svm_name
@@ -117,8 +117,8 @@ def test_create_lif_svm_not_found(
         mock_client.find_svm.assert_called_once_with(expected_svm_name)
 
         # Verify no port or interface creation was attempted
-        mock_client.create_port.assert_not_called()
-        mock_client.create_ip_interface.assert_not_called()
+        mock_client.get_or_create_port.assert_not_called()
+        mock_client.get_or_create_ip_interface.assert_not_called()
 
     def test_create_lif_port_creation_error(
         self, lif_service, mock_client, mock_error_handler, sample_config
@@ -137,7 +137,7 @@ def test_create_lif_port_creation_error(
         mock_client.get_nodes.return_value = [mock_node]
 
         # Mock port creation failure
-        mock_client.create_port.side_effect = Exception("Port creation failed")
+        mock_client.get_or_create_port.side_effect = Exception("Port creation failed")
         mock_error_handler.handle_operation_error.side_effect = NetAppManagerError(
             "Operation failed"
         )
@@ -160,15 +160,15 @@ def test_create_home_port_success(
         mock_port = PortResult(
             uuid="port-uuid-123", name="e4a-100", node_name="node-01", port_type="vlan"
         )
-        mock_client.create_port.return_value = mock_port
+        mock_client.get_or_create_port.return_value = mock_port
 
         result = lif_service.create_home_port(sample_config)
 
         assert result == mock_port
 
         # Verify port was created with correct specification
-        mock_client.create_port.assert_called_once()
-        call_args = mock_client.create_port.call_args[0][0]
+        mock_client.get_or_create_port.assert_called_once()
+        call_args = mock_client.get_or_create_port.call_args[0][0]
         assert isinstance(call_args, PortSpec)
         assert call_args.node_name == "node-01"
         assert call_args.vlan_id == 100
@@ -189,7 +189,7 @@ def test_create_home_port_no_node(
             lif_service.create_home_port(sample_config)
 
         # Verify no port creation was attempted
-        mock_client.create_port.assert_not_called()
+        mock_client.get_or_create_port.assert_not_called()
 
     def test_identify_home_node_success(
         self, lif_service, mock_client, mock_error_handler, sample_config
@@ -284,10 +284,10 @@ def test_interface_spec_creation(
         mock_port = PortResult(
             uuid="port-uuid-123", name="e4a-100", node_name="node-01", port_type="vlan"
         )
-        mock_client.create_port.return_value = mock_port
+        mock_client.get_or_create_port.return_value = mock_port
 
         # Mock interface creation
-        mock_client.create_ip_interface.return_value = InterfaceResult(
+        mock_client.get_or_create_ip_interface.return_value = InterfaceResult(
             name=sample_config.name,
             uuid="interface-uuid-123",
             address=str(sample_config.address),
@@ -302,7 +302,7 @@ def test_interface_spec_creation(
         lif_service.create_lif(project_id, sample_config)
 
         # Verify the interface spec is created correctly
-        interface_call_args = mock_client.create_ip_interface.call_args[0][0]
+        interface_call_args = mock_client.get_or_create_ip_interface.call_args[0][0]
         assert interface_call_args.name == sample_config.name
         assert str(interface_call_args.address) == str(sample_config.address)
         assert interface_call_args.netmask == str(sample_config.network.netmask)
@@ -323,14 +323,14 @@ def test_port_spec_creation(
         mock_client.get_nodes.return_value = [mock_node]
 
         # Mock port creation
-        mock_client.create_port.return_value = PortResult(
+        mock_client.get_or_create_port.return_value = PortResult(
             uuid="port-uuid-123", name="e4a-100", node_name="node-01", port_type="vlan"
         )
 
         lif_service.create_home_port(sample_config)
 
         # Verify the port spec is created correctly
-        port_call_args = mock_client.create_port.call_args[0][0]
+        port_call_args = mock_client.get_or_create_port.call_args[0][0]
         assert port_call_args.node_name == "node-01"
         assert port_call_args.vlan_id == sample_config.vlan_id
         assert port_call_args.base_port_name == sample_config.base_port_name