Issue-ID: TEST-414

Signed-off-by: Abhishek Patil <abhishek.patil@t-systems.com>
Change-Id: If15b480a5fd748dc664e1234d3af5bda0b7c87a8

3 files changed, 42 insertions, 0 deletions

diff --git a/tests/test_aai_service_instance.py b/tests/test_aai_service_instance.py
index 3b758d8..070c5be 100644
--- a/tests/test_aai_service_instance.py
+++ b/tests/test_aai_service_instance.py
@@ -21,6 +21,8 @@ from onapsdk.so.deletion import ServiceDeletionRequest
 from onapsdk.so.instantiation import NetworkInstantiation, VnfInstantiation
 from onapsdk.exceptions import StatusError
 
+from src.onapsdk.so.instantiation import NetworkDetails
+
 RELATIONSHIPS_VNF = {
     "relationship": [
         {
@@ -245,6 +247,24 @@ def test_service_instance_add_network(mock_sdc_service, mock_network_instantiati
                                  mock.MagicMock())
     mock_network_instantiation.assert_called_once()
 
+@mock.patch.object(NetworkInstantiation, "instantiate_macro")
+@mock.patch.object(ServiceInstance, "sdc_service", new_callable=mock.PropertyMock)
+def test_service_instance_generic_network(mock_sdc_service, mock_network_instantiation):
+    service_instance = ServiceInstance(service_subscription=mock.MagicMock(),
+                                       instance_id="test_service_instance_id")
+    service_instance.orchestration_status = "Active"
+    network_details = NetworkDetails(vnf_id="vnf_id",
+                                     network_type="generic-network",
+                                     child_resources=mock.MagicMock(),
+                                     related_to=mock.MagicMock())
+    service_instance.add_network(mock.MagicMock(),
+                                 mock.MagicMock(),
+                                 mock.MagicMock(),
+                                 a_la_carte=False,
+                                 tenant=mock.MagicMock(),
+                                 cloud_region=mock.MagicMock(),
+                                 network_details=network_details)
+    mock_network_instantiation.assert_called_once()
 
 @mock.patch.object(ServiceDeletionRequest, "send_request")
 @mock.patch.object(ServiceInstance, "sdc_service", new_callable=mock.PropertyMock)
diff --git a/tests/test_aai_site_resource.py b/tests/test_aai_site_resource.py
index 0150eff..17527a2 100644
--- a/tests/test_aai_site_resource.py
+++ b/tests/test_aai_site_resource.py
@@ -101,3 +101,4 @@ def test_site_resource_link_to_site_resource(mock_add_relationship):
         "relationship-key": "site_resource.site-resource-id",
         "relationship-value": "test-site-resource-id",
     }]
+
diff --git a/tests/test_so_instantiation.py b/tests/test_so_instantiation.py
index e3dcfd7..0269110 100644
--- a/tests/test_so_instantiation.py
+++ b/tests/test_so_instantiation.py
@@ -1359,3 +1359,24 @@ def test_so_service_vnf_load_from_yaml():
     assert len(so_vnf_vf_module_2.parameters) == 2
     assert so_vnf_vf_module_2.parameters["param-vfm2"] == "value-vfm2"
     assert so_vnf_vf_module_2.parameters["param-vfm3"] == "value-vfm3"
+
+
+@mock.patch.object(NetworkInstantiation, "send_message_json")
+@mock.patch.object(NetworkPreload, "send_message_json")
+def test_network_instantiation(mock_network_preload, mock_network_instantiation_send_message):
+    aai_service_instance_mock = mock.MagicMock()
+    aai_service_instance_mock.instance_id = "test_instance_id"
+    vnf_instantiation = NetworkInstantiation. \
+        instantiate_macro(aai_service_instance=aai_service_instance_mock,
+                          network_object=mock.MagicMock(),
+                          line_of_business="test_lob",
+                          platform="test_platform",
+                          cloud_region=mock.MagicMock(),
+                          tenant=mock.MagicMock(),
+                          network_details=mock.MagicMock())
+    mock_network_instantiation_send_message.assert_called_once()
+    method, _, url = mock_network_instantiation_send_message.call_args[0]
+    assert method == "POST"
+    assert url == (f"{NetworkInstantiation.base_url}/onap/so/infra/serviceInstantiation/"
+                   f"{NetworkInstantiation.api_version}/serviceInstances/"
+                   f"{aai_service_instance_mock.instance_id}/networks")