X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=NG-RO%2Fosm_ng_ro%2Ftests%2Ftest_ns.py;h=3dd699bc25cb1aa313cfe089bbb97859ff4f21ac;hb=refs%2Fchanges%2F84%2F12084%2F9;hp=bcd5d46d22664123696623b680053b2739bf558f;hpb=0b1e734d5b51b23442aa903b4096bcf7bc48ec8d;p=osm%2FRO.git

diff --git a/NG-RO/osm_ng_ro/tests/test_ns.py b/NG-RO/osm_ng_ro/tests/test_ns.py
index bcd5d46d..3dd699bc 100644
--- a/NG-RO/osm_ng_ro/tests/test_ns.py
+++ b/NG-RO/osm_ng_ro/tests/test_ns.py
@@ -130,6 +130,7 @@ class TestNs(unittest.TestCase):
                 "vim_name": None,
                 "vim_status": None,
                 "vim_details": None,
+                "vim_message": None,
                 "refresh_at": None,
             },
             "modified_at": now,
@@ -1407,8 +1408,15 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+
         target_flavor = {}
-        indata = {}
+        indata = {
+            "vnf": [
+                {
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+                },
+            ],
+        }
         vim_info = {}
         target_record_id = ""
 
@@ -1427,6 +1435,7 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+
         target_flavor = {
             "no-target-flavor": "here",
         }
@@ -1449,6 +1458,7 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1493,6 +1503,7 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1539,6 +1550,52 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+        db = MagicMock(name="database mock")
+        kwargs = {
+            "db": db,
+        }
+
+        db.get_one.return_value = {
+            "_id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+            "df": [
+                {
+                    "id": "default-df",
+                    "vdu-profile": [
+                        {"id": "without_volumes-VM", "min-number-of-instances": 1}
+                    ],
+                }
+            ],
+            "id": "without_volumes-vnf",
+            "product-name": "without_volumes-vnf",
+            "vdu": [
+                {
+                    "id": "without_volumes-VM",
+                    "name": "without_volumes-VM",
+                    "sw-image-desc": "ubuntu20.04",
+                    "alternative-sw-image-desc": [
+                        "ubuntu20.04-aws",
+                        "ubuntu20.04-azure",
+                    ],
+                    "virtual-storage-desc": ["root-volume", "ephemeral-volume"],
+                }
+            ],
+            "version": "1.0",
+            "virtual-storage-desc": [
+                {"id": "root-volume", "size-of-storage": "10"},
+                {
+                    "id": "ephemeral-volume",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                    "size-of-storage": "1",
+                },
+            ],
+            "_admin": {
+                "storage": {
+                    "fs": "mongo",
+                    "path": "/app/storage/",
+                },
+                "type": "vnfd",
+            },
+        }
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1579,6 +1636,7 @@ class TestNs(unittest.TestCase):
                             ],
                         },
                     ],
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
                 },
             ],
         }
@@ -1592,6 +1650,7 @@ class TestNs(unittest.TestCase):
             indata=indata,
             vim_info=vim_info,
             target_record_id=target_record_id,
+            **kwargs,
         )
 
         self.assertTrue(epa_params.called)
@@ -1602,6 +1661,7 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1642,6 +1702,7 @@ class TestNs(unittest.TestCase):
                             ],
                         },
                     ],
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
                 },
             ],
         }
@@ -1660,11 +1721,124 @@ class TestNs(unittest.TestCase):
         self.assertTrue(epa_params.called)
         self.assertDictEqual(result, expected_result)
 
+    @patch("osm_ng_ro.ns.Ns._process_epa_params")
+    def test__process_flavor_params_with_persistent_root_disk(
+        self,
+        epa_params,
+    ):
+        db = MagicMock(name="database mock")
+
+        kwargs = {
+            "db": db,
+        }
+
+        db.get_one.return_value = {
+            "_id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+            "df": [
+                {
+                    "id": "default-df",
+                    "vdu-profile": [
+                        {"id": "several_volumes-VM", "min-number-of-instances": 1}
+                    ],
+                }
+            ],
+            "id": "several_volumes-vnf",
+            "product-name": "several_volumes-vnf",
+            "vdu": [
+                {
+                    "id": "several_volumes-VM",
+                    "name": "several_volumes-VM",
+                    "sw-image-desc": "ubuntu20.04",
+                    "alternative-sw-image-desc": [
+                        "ubuntu20.04-aws",
+                        "ubuntu20.04-azure",
+                    ],
+                    "virtual-storage-desc": [
+                        "persistent-root-volume",
+                    ],
+                }
+            ],
+            "version": "1.0",
+            "virtual-storage-desc": [
+                {
+                    "id": "persistent-root-volume",
+                    "type-of-storage": "persistent-storage:persistent-storage",
+                    "size-of-storage": "10",
+                },
+            ],
+            "_admin": {
+                "storage": {
+                    "fs": "mongo",
+                    "path": "/app/storage/",
+                },
+                "type": "vnfd",
+            },
+        }
+        expected_result = {
+            "find_params": {
+                "flavor_data": {
+                    "disk": 0,
+                    "ram": 1024,
+                    "vcpus": 2,
+                },
+            },
+            "params": {
+                "flavor_data": {
+                    "disk": 0,
+                    "name": "test",
+                    "ram": 1024,
+                    "vcpus": 2,
+                },
+            },
+        }
+        target_flavor = {
+            "id": "test_id",
+            "name": "test",
+            "storage-gb": "10",
+            "memory-mb": "1024",
+            "vcpu-count": "2",
+        }
+        indata = {
+            "vnf": [
+                {
+                    "vdur": [
+                        {
+                            "vdu-name": "several_volumes-VM",
+                            "ns-flavor-id": "test_id",
+                            "virtual-storages": [
+                                {
+                                    "type-of-storage": "persistent-storage:persistent-storage",
+                                    "size-of-storage": "10",
+                                },
+                            ],
+                        },
+                    ],
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+                },
+            ],
+        }
+        vim_info = {}
+        target_record_id = ""
+
+        epa_params.return_value = {}
+
+        result = Ns._process_flavor_params(
+            target_flavor=target_flavor,
+            indata=indata,
+            vim_info=vim_info,
+            target_record_id=target_record_id,
+            **kwargs,
+        )
+
+        self.assertTrue(epa_params.called)
+        self.assertDictEqual(result, expected_result)
+
     @patch("osm_ng_ro.ns.Ns._process_epa_params")
     def test__process_flavor_params_with_epa_params(
         self,
         epa_params,
     ):
+
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1695,7 +1869,18 @@ class TestNs(unittest.TestCase):
             "memory-mb": "1024",
             "vcpu-count": "2",
         }
-        indata = {}
+        indata = {
+            "vnf": [
+                {
+                    "vdur": [
+                        {
+                            "ns-flavor-id": "test_id",
+                        },
+                    ],
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+                },
+            ],
+        }
         vim_info = {}
         target_record_id = ""
 
@@ -1718,6 +1903,54 @@ class TestNs(unittest.TestCase):
         self,
         epa_params,
     ):
+        db = MagicMock(name="database mock")
+
+        kwargs = {
+            "db": db,
+        }
+
+        db.get_one.return_value = {
+            "_id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+            "df": [
+                {
+                    "id": "default-df",
+                    "vdu-profile": [
+                        {"id": "without_volumes-VM", "min-number-of-instances": 1}
+                    ],
+                }
+            ],
+            "id": "without_volumes-vnf",
+            "product-name": "without_volumes-vnf",
+            "vdu": [
+                {
+                    "id": "without_volumes-VM",
+                    "name": "without_volumes-VM",
+                    "sw-image-desc": "ubuntu20.04",
+                    "alternative-sw-image-desc": [
+                        "ubuntu20.04-aws",
+                        "ubuntu20.04-azure",
+                    ],
+                    "virtual-storage-desc": ["root-volume", "ephemeral-volume"],
+                }
+            ],
+            "version": "1.0",
+            "virtual-storage-desc": [
+                {"id": "root-volume", "size-of-storage": "10"},
+                {
+                    "id": "ephemeral-volume",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                    "size-of-storage": "1",
+                },
+            ],
+            "_admin": {
+                "storage": {
+                    "fs": "mongo",
+                    "path": "/app/storage/",
+                },
+                "type": "vnfd",
+            },
+        }
+
         expected_result = {
             "find_params": {
                 "flavor_data": {
@@ -1770,6 +2003,7 @@ class TestNs(unittest.TestCase):
                             ],
                         },
                     ],
+                    "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
                 },
             ],
         }
@@ -1785,6 +2019,7 @@ class TestNs(unittest.TestCase):
             indata=indata,
             vim_info=vim_info,
             target_record_id=target_record_id,
+            **kwargs,
         )
 
         self.assertTrue(epa_params.called)
@@ -2457,8 +2692,346 @@ class TestNs(unittest.TestCase):
     def test__process_vdu_params_vdu_ssh_access_required(self):
         pass
 
-    def test__process_vdu_params_vdu_virtual_storages(self):
-        pass
+    @patch("osm_ng_ro.ns.Ns._get_cloud_init")
+    @patch("osm_ng_ro.ns.Ns._parse_jinja2")
+    def test__process_vdu_params_vdu_persistent_root_volume(
+        self, get_cloud_init, parse_jinja2
+    ):
+        db = MagicMock(name="database mock")
+        kwargs = {
+            "db": db,
+            "vdu2cloud_init": {},
+            "vnfr": {
+                "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+                "member-vnf-index-ref": "vnf-several-volumes",
+            },
+        }
+        get_cloud_init.return_value = {}
+        parse_jinja2.return_value = {}
+        db.get_one.return_value = {
+            "_id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+            "df": [
+                {
+                    "id": "default-df",
+                    "vdu-profile": [
+                        {"id": "several_volumes-VM", "min-number-of-instances": 1}
+                    ],
+                }
+            ],
+            "id": "several_volumes-vnf",
+            "product-name": "several_volumes-vnf",
+            "vdu": [
+                {
+                    "id": "several_volumes-VM",
+                    "name": "several_volumes-VM",
+                    "sw-image-desc": "ubuntu20.04",
+                    "alternative-sw-image-desc": [
+                        "ubuntu20.04-aws",
+                        "ubuntu20.04-azure",
+                    ],
+                    "virtual-storage-desc": [
+                        "persistent-root-volume",
+                        "persistent-volume2",
+                        "ephemeral-volume",
+                    ],
+                }
+            ],
+            "version": "1.0",
+            "virtual-storage-desc": [
+                {
+                    "id": "persistent-volume2",
+                    "type-of-storage": "persistent-storage:persistent-storage",
+                    "size-of-storage": "10",
+                },
+                {
+                    "id": "persistent-root-volume",
+                    "type-of-storage": "persistent-storage:persistent-storage",
+                    "size-of-storage": "10",
+                },
+                {
+                    "id": "ephemeral-volume",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                    "size-of-storage": "1",
+                },
+            ],
+            "_admin": {
+                "storage": {
+                    "fs": "mongo",
+                    "path": "/app/storage/",
+                },
+                "type": "vnfd",
+            },
+        }
+
+        target_vdu = {
+            "_id": "09a0baa7-b7cb-4924-bd63-9f04a1c23960",
+            "ns-flavor-id": "0",
+            "ns-image-id": "0",
+            "vdu-name": "several_volumes-VM",
+            "interfaces": [
+                {
+                    "name": "vdu-eth0",
+                    "ns-vld-id": "mgmtnet",
+                }
+            ],
+            "virtual-storages": [
+                {
+                    "id": "persistent-volume2",
+                    "size-of-storage": "10",
+                    "type-of-storage": "persistent-storage:persistent-storage",
+                },
+                {
+                    "id": "persistent-root-volume",
+                    "size-of-storage": "10",
+                    "type-of-storage": "persistent-storage:persistent-storage",
+                },
+                {
+                    "id": "ephemeral-volume",
+                    "size-of-storage": "1",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                },
+            ],
+        }
+        indata = {
+            "name": "sample_name",
+        }
+        expected_result = [{"image_id": "ubuntu20.04", "size": "10"}, {"size": "10"}]
+        result = Ns._process_vdu_params(
+            target_vdu, indata, vim_info=None, target_record_id=None, **kwargs
+        )
+        self.assertEqual(
+            expected_result, result["params"]["disk_list"], "Wrong Disk List"
+        )
+
+    @patch("osm_ng_ro.ns.Ns._get_cloud_init")
+    @patch("osm_ng_ro.ns.Ns._parse_jinja2")
+    def test__process_vdu_params_vdu_without_persistent_storage(
+        self, get_cloud_init, parse_jinja2
+    ):
+        db = MagicMock(name="database mock")
+        kwargs = {
+            "db": db,
+            "vdu2cloud_init": {},
+            "vnfr": {
+                "vnfd-id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+                "member-vnf-index-ref": "vnf-several-volumes",
+            },
+        }
+        get_cloud_init.return_value = {}
+        parse_jinja2.return_value = {}
+        db.get_one.return_value = {
+            "_id": "ad6356e3-698c-43bf-9901-3aae9e9b9d18",
+            "df": [
+                {
+                    "id": "default-df",
+                    "vdu-profile": [
+                        {"id": "without_volumes-VM", "min-number-of-instances": 1}
+                    ],
+                }
+            ],
+            "id": "without_volumes-vnf",
+            "product-name": "without_volumes-vnf",
+            "vdu": [
+                {
+                    "id": "without_volumes-VM",
+                    "name": "without_volumes-VM",
+                    "sw-image-desc": "ubuntu20.04",
+                    "alternative-sw-image-desc": [
+                        "ubuntu20.04-aws",
+                        "ubuntu20.04-azure",
+                    ],
+                    "virtual-storage-desc": ["root-volume", "ephemeral-volume"],
+                }
+            ],
+            "version": "1.0",
+            "virtual-storage-desc": [
+                {"id": "root-volume", "size-of-storage": "10"},
+                {
+                    "id": "ephemeral-volume",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                    "size-of-storage": "1",
+                },
+            ],
+            "_admin": {
+                "storage": {
+                    "fs": "mongo",
+                    "path": "/app/storage/",
+                },
+                "type": "vnfd",
+            },
+        }
+
+        target_vdu = {
+            "_id": "09a0baa7-b7cb-4924-bd63-9f04a1c23960",
+            "ns-flavor-id": "0",
+            "ns-image-id": "0",
+            "vdu-name": "without_volumes-VM",
+            "interfaces": [
+                {
+                    "name": "vdu-eth0",
+                    "ns-vld-id": "mgmtnet",
+                }
+            ],
+            "virtual-storages": [
+                {
+                    "id": "root-volume",
+                    "size-of-storage": "10",
+                },
+                {
+                    "id": "ephemeral-volume",
+                    "size-of-storage": "1",
+                    "type-of-storage": "etsi-nfv-descriptors:ephemeral-storage",
+                },
+            ],
+        }
+        indata = {
+            "name": "sample_name",
+        }
+        expected_result = []
+        result = Ns._process_vdu_params(
+            target_vdu, indata, vim_info=None, target_record_id=None, **kwargs
+        )
+        self.assertEqual(
+            expected_result, result["params"]["disk_list"], "Wrong Disk List"
+        )
 
     def test__process_vdu_params(self):
         pass
+
+    @patch("osm_ng_ro.ns.Ns._assign_vim")
+    def test__rebuild_start_stop_task(self, assign_vim):
+        self.ns = Ns()
+        extra_dict = {}
+        actions = ["start", "stop", "rebuild"]
+        vdu_id = "bb9c43f9-10a2-4569-a8a8-957c3528b6d1"
+        vnf_id = "665b4165-ce24-4320-bf19-b9a45bade49f"
+        vdu_index = "0"
+        action_id = "bb937f49-3870-4169-b758-9732e1ff40f3"
+        nsr_id = "993166fe-723e-4680-ac4b-b1af2541ae31"
+        task_index = 0
+        target_vim = "vim:f9f370ac-0d44-41a7-9000-457f2332bc35"
+        t = "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:vdur.bb9c43f9-10a2-4569-a8a8-957c3528b6d1"
+        for action in actions:
+            expected_result = {
+                "target_id": "vim:f9f370ac-0d44-41a7-9000-457f2332bc35",
+                "action_id": "bb937f49-3870-4169-b758-9732e1ff40f3",
+                "nsr_id": "993166fe-723e-4680-ac4b-b1af2541ae31",
+                "task_id": "bb937f49-3870-4169-b758-9732e1ff40f3:0",
+                "status": "SCHEDULED",
+                "action": "EXEC",
+                "item": "update",
+                "target_record": "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:vdur.0",
+                "target_record_id": t,
+                "params": {
+                    "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+                    "action": action,
+                },
+            }
+            extra_dict["params"] = {
+                "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+                "action": action,
+            }
+            task = self.ns.rebuild_start_stop_task(
+                vdu_id,
+                vnf_id,
+                vdu_index,
+                action_id,
+                nsr_id,
+                task_index,
+                target_vim,
+                extra_dict,
+            )
+            self.assertEqual(task.get("action_id"), action_id)
+            self.assertEqual(task.get("nsr_id"), nsr_id)
+            self.assertEqual(task.get("target_id"), target_vim)
+            self.assertDictEqual(task, expected_result)
+
+    @patch("osm_ng_ro.ns.Ns._assign_vim")
+    def test_verticalscale_task(self, assign_vim):
+        self.ns = Ns()
+        extra_dict = {}
+        vdu_index = "1"
+        action_id = "bb937f49-3870-4169-b758-9732e1ff40f3"
+        nsr_id = "993166fe-723e-4680-ac4b-b1af2541ae31"
+        task_index = 1
+        target_record_id = (
+            "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:"
+            "vdur.bb9c43f9-10a2-4569-a8a8-957c3528b6d1"
+        )
+
+        expected_result = {
+            "target_id": "vim:f9f370ac-0d44-41a7-9000-457f2332bc35",
+            "action_id": "bb937f49-3870-4169-b758-9732e1ff40f3",
+            "nsr_id": "993166fe-723e-4680-ac4b-b1af2541ae31",
+            "task_id": "bb937f49-3870-4169-b758-9732e1ff40f3:1",
+            "status": "SCHEDULED",
+            "action": "EXEC",
+            "item": "verticalscale",
+            "target_record": "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:vdur.1",
+            "target_record_id": target_record_id,
+            "params": {
+                "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+                "flavor_dict": "flavor_dict",
+            },
+        }
+        vdu = {
+            "id": "bb9c43f9-10a2-4569-a8a8-957c3528b6d1",
+            "vim_info": {
+                "vim:f9f370ac-0d44-41a7-9000-457f2332bc35": {"interfaces": []}
+            },
+        }
+        vnf = {"_id": "665b4165-ce24-4320-bf19-b9a45bade49f"}
+        extra_dict["params"] = {
+            "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+            "flavor_dict": "flavor_dict",
+        }
+        task = self.ns.verticalscale_task(
+            vdu, vnf, vdu_index, action_id, nsr_id, task_index, extra_dict
+        )
+
+        self.assertDictEqual(task, expected_result)
+
+    @patch("osm_ng_ro.ns.Ns._assign_vim")
+    def test_migrate_task(self, assign_vim):
+        self.ns = Ns()
+        extra_dict = {}
+        vdu_index = "1"
+        action_id = "bb937f49-3870-4169-b758-9732e1ff40f3"
+        nsr_id = "993166fe-723e-4680-ac4b-b1af2541ae31"
+        task_index = 1
+        target_record_id = (
+            "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:"
+            "vdur.bb9c43f9-10a2-4569-a8a8-957c3528b6d1"
+        )
+
+        expected_result = {
+            "target_id": "vim:f9f370ac-0d44-41a7-9000-457f2332bc35",
+            "action_id": "bb937f49-3870-4169-b758-9732e1ff40f3",
+            "nsr_id": "993166fe-723e-4680-ac4b-b1af2541ae31",
+            "task_id": "bb937f49-3870-4169-b758-9732e1ff40f3:1",
+            "status": "SCHEDULED",
+            "action": "EXEC",
+            "item": "migrate",
+            "target_record": "vnfrs:665b4165-ce24-4320-bf19-b9a45bade49f:vdur.1",
+            "target_record_id": target_record_id,
+            "params": {
+                "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+                "migrate_host": "migrateToHost",
+            },
+        }
+        vdu = {
+            "id": "bb9c43f9-10a2-4569-a8a8-957c3528b6d1",
+            "vim_info": {
+                "vim:f9f370ac-0d44-41a7-9000-457f2332bc35": {"interfaces": []}
+            },
+        }
+        vnf = {"_id": "665b4165-ce24-4320-bf19-b9a45bade49f"}
+        extra_dict["params"] = {
+            "vim_vm_id": "f37b18ef-3caa-4dc9-ab91-15c669b16396",
+            "migrate_host": "migrateToHost",
+        }
+        task = self.ns.migrate_task(
+            vdu, vnf, vdu_index, action_id, nsr_id, task_index, extra_dict
+        )
+
+        self.assertDictEqual(task, expected_result)