import unittest
from unittest.mock import MagicMock, Mock, patch
-from jinja2 import TemplateError, TemplateNotFound, UndefinedError
+from jinja2 import (
+ Environment,
+ select_autoescape,
+ StrictUndefined,
+ TemplateError,
+ TemplateNotFound,
+ UndefinedError,
+)
from osm_ng_ro.ns import Ns, NsException
self.assertDictEqual(expected_result, result)
def test__process_guest_epa_numa_params_with_empty_numa_params(self):
- expected_numa_result = {}
+ expected_numa_result = []
expected_epa_vcpu_set_result = False
guest_epa_quota = {}
numa_result, epa_vcpu_set_result = Ns._process_guest_epa_numa_params(
guest_epa_quota=guest_epa_quota,
)
-
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_wrong_numa_params(self):
- expected_numa_result = {}
+ expected_numa_result = []
expected_epa_vcpu_set_result = False
guest_epa_quota = {"no_nume": "here"}
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_numa_node_policy(self):
- expected_numa_result = {}
+ expected_numa_result = []
expected_epa_vcpu_set_result = False
guest_epa_quota = {"numa-node-policy": {}}
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_no_node(self):
- expected_numa_result = {}
+ expected_numa_result = []
expected_epa_vcpu_set_result = False
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_1_node_num_cores(self):
- expected_numa_result = {"cores": 3}
+ expected_numa_result = [{"cores": 3}]
expected_epa_vcpu_set_result = True
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_1_node_paired_threads(self):
- expected_numa_result = {"paired-threads": 3}
+ expected_numa_result = [{"paired_threads": 3}]
expected_epa_vcpu_set_result = True
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_1_node_paired_threads_ids(self):
- expected_numa_result = {
- "paired-threads-id": [("0", "1"), ("4", "5")],
- }
+ expected_numa_result = [
+ {
+ "paired-threads-id": [("0", "1"), ("4", "5")],
+ }
+ ]
expected_epa_vcpu_set_result = False
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_1_node_num_threads(self):
- expected_numa_result = {"threads": 3}
+ expected_numa_result = [{"threads": 3}]
expected_epa_vcpu_set_result = True
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_1_node_memory_mb(self):
- expected_numa_result = {"memory": 2}
+ expected_numa_result = [{"memory": 2}]
expected_epa_vcpu_set_result = False
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
- def test__process_guest_epa_numa_params_with_1_node(self):
- expected_numa_result = {
- "cores": 3,
- "paired-threads": 3,
- "paired-threads-id": [("0", "1"), ("4", "5")],
- "threads": 3,
- "memory": 2,
+ def test__process_guest_epa_numa_params_with_1_node_vcpu(self):
+ expected_numa_result = [
+ {
+ "id": 0,
+ "vcpu": [0, 1],
+ }
+ ]
+ expected_epa_vcpu_set_result = False
+ guest_epa_quota = {
+ "numa-node-policy": {
+ "node": [{"id": "0", "vcpu": [{"id": "0"}, {"id": "1"}]}],
+ },
}
+
+ numa_result, epa_vcpu_set_result = Ns._process_guest_epa_numa_params(
+ guest_epa_quota=guest_epa_quota,
+ )
+
+ self.assertEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
+
+ def test__process_guest_epa_numa_params_with_2_node_vcpu(self):
+ expected_numa_result = [
+ {
+ "id": 0,
+ "vcpu": [0, 1],
+ },
+ {
+ "id": 1,
+ "vcpu": [2, 3],
+ },
+ ]
+
+ expected_epa_vcpu_set_result = False
+ guest_epa_quota = {
+ "numa-node-policy": {
+ "node": [
+ {"id": "0", "vcpu": [{"id": "0"}, {"id": "1"}]},
+ {"id": "1", "vcpu": [{"id": "2"}, {"id": "3"}]},
+ ],
+ },
+ }
+
+ numa_result, epa_vcpu_set_result = Ns._process_guest_epa_numa_params(
+ guest_epa_quota=guest_epa_quota,
+ )
+
+ self.assertEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
+
+ def test__process_guest_epa_numa_params_with_1_node(self):
+ expected_numa_result = [
+ {
+ # "id": 0,
+ # "vcpu": [0, 1],
+ "cores": 3,
+ "paired_threads": 3,
+ "paired-threads-id": [("0", "1"), ("4", "5")],
+ "threads": 3,
+ "memory": 2,
+ }
+ ]
expected_epa_vcpu_set_result = True
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_numa_params_with_2_nodes(self):
- expected_numa_result = {
- "cores": 3,
- "paired-threads": 3,
- "paired-threads-id": [("0", "1"), ("4", "5")],
- "threads": 3,
- "memory": 2,
- }
+ expected_numa_result = [
+ {
+ "cores": 3,
+ "paired_threads": 3,
+ "paired-threads-id": [("0", "1"), ("4", "5")],
+ "threads": 3,
+ "memory": 2,
+ },
+ {
+ "cores": 7,
+ "paired_threads": 7,
+ "paired-threads-id": [("2", "3"), ("5", "6")],
+ "threads": 4,
+ "memory": 4,
+ },
+ ]
expected_epa_vcpu_set_result = True
guest_epa_quota = {
"numa-node-policy": {
guest_epa_quota=guest_epa_quota,
)
- self.assertDictEqual(expected_numa_result, numa_result)
+ self.assertEqual(expected_numa_result, numa_result)
self.assertEqual(expected_epa_vcpu_set_result, epa_vcpu_set_result)
def test__process_guest_epa_cpu_pinning_params_with_empty_params(self):
guest_epa_cpu_pinning_params,
guest_epa_quota_params,
):
- expected_result = {}
+ expected_result = {
+ "mem-policy": "STRICT",
+ }
target_flavor = {
"guest-epa": {
"vcpu-count": 1,
+ "numa-node-policy": {
+ "mem-policy": "STRICT",
+ },
},
}
):
expected_result = {
"mempage-size": "1G",
+ "mem-policy": "STRICT",
}
target_flavor = {
- "guest-epa": {"vcpu-count": 1, "mempage-size": "1G"},
+ "guest-epa": {
+ "vcpu-count": 1,
+ "mempage-size": "1G",
+ "numa-node-policy": {
+ "mem-policy": "STRICT",
+ },
+ },
}
guest_epa_numa_params.return_value = ({}, False)
):
expected_result = {
"mempage-size": "1G",
+ "cpu-pinning-policy": "DEDICATED",
+ "cpu-thread-pinning-policy": "PREFER",
"numas": [
{
"cores": 3,
}
guest_epa_numa_params.return_value = (
- {
- "cores": 3,
- "paired-threads": 3,
- "paired-threads-id": [("0", "1"), ("4", "5")],
- "threads": 3,
- "memory": 2,
- },
+ [
+ {
+ "cores": 3,
+ "paired-threads": 3,
+ "paired-threads-id": [("0", "1"), ("4", "5")],
+ "threads": 3,
+ "memory": 2,
+ },
+ ],
True,
)
guest_epa_cpu_pinning_params.return_value = (
result = Ns._process_epa_params(
target_flavor=target_flavor,
)
-
- self.assertDictEqual(expected_result, result)
+ self.assertEqual(expected_result, result)
self.assertTrue(guest_epa_numa_params.called)
self.assertTrue(guest_epa_cpu_pinning_params.called)
self.assertTrue(guest_epa_quota_params.called)
self,
epa_params,
):
-
target_flavor = {}
indata = {
"vnf": [
self,
epa_params,
):
-
target_flavor = {
"no-target-flavor": "here",
}
self,
epa_params,
):
-
expected_result = {
"find_params": {
"flavor_data": {
self,
epa_params,
):
-
expected_result = {
"find_params": {
"flavor_data": {
self,
epa_params,
):
-
expected_result = {
"find_params": {
"flavor_data": {
self,
epa_params,
):
-
expected_result = {
"find_params": {
"flavor_data": {
cloud_init_content=cloud_init_content, params=params, context=context
)
- def test__parse_jinja2(self):
- pass
+ def test_rendering_jinja2_temp_without_special_characters(self):
+ cloud_init_content = """
+ disk_setup:
+ ephemeral0:
+ table_type: {{type}}
+ layout: True
+ overwrite: {{is_override}}
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '{{command}}'" ]
+ """
+ params = {
+ "type": "mbr",
+ "is_override": "False",
+ "command": "; mkdir abc",
+ }
+ context = "cloud-init for VM"
+ expected_result = """
+ disk_setup:
+ ephemeral0:
+ table_type: mbr
+ layout: True
+ overwrite: False
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '; mkdir abc'" ]
+ """
+ result = Ns._parse_jinja2(
+ cloud_init_content=cloud_init_content, params=params, context=context
+ )
+ self.assertEqual(result, expected_result)
+
+ def test_rendering_jinja2_temp_with_special_characters(self):
+ cloud_init_content = """
+ disk_setup:
+ ephemeral0:
+ table_type: {{type}}
+ layout: True
+ overwrite: {{is_override}}
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '{{command}}'" ]
+ """
+ params = {
+ "type": "mbr",
+ "is_override": "False",
+ "command": "& rm -rf",
+ }
+ context = "cloud-init for VM"
+ expected_result = """
+ disk_setup:
+ ephemeral0:
+ table_type: mbr
+ layout: True
+ overwrite: False
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '& rm -rf /'" ]
+ """
+ result = Ns._parse_jinja2(
+ cloud_init_content=cloud_init_content, params=params, context=context
+ )
+ self.assertNotEqual(result, expected_result)
+
+ def test_rendering_jinja2_temp_with_special_characters_autoescape_is_false(self):
+ with patch("osm_ng_ro.ns.Environment") as mock_environment:
+ mock_environment.return_value = Environment(
+ undefined=StrictUndefined,
+ autoescape=select_autoescape(default_for_string=False, default=False),
+ )
+ cloud_init_content = """
+ disk_setup:
+ ephemeral0:
+ table_type: {{type}}
+ layout: True
+ overwrite: {{is_override}}
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '{{command}}'" ]
+ """
+ params = {
+ "type": "mbr",
+ "is_override": "False",
+ "command": "& rm -rf /",
+ }
+ context = "cloud-init for VM"
+ expected_result = """
+ disk_setup:
+ ephemeral0:
+ table_type: mbr
+ layout: True
+ overwrite: False
+ runcmd:
+ - [ ls, -l, / ]
+ - [ sh, -xc, "echo $(date) '& rm -rf /'" ]
+ """
+ result = Ns._parse_jinja2(
+ cloud_init_content=cloud_init_content,
+ params=params,
+ context=context,
+ )
+ self.assertEqual(result, expected_result)
def test__process_vdu_params_empty_kargs(self):
pass