5f35b695bf
This patch provides a base to support multi version API. The existing code of functions for SOL specification was hard to understand and enhance since it is based on the code of legacy tacker API and they are connected with each other complicatedly. Therefore the code for SOL specification is newly created which is independent to the legacy tacker API so that it will be easy to maintain and enhance. This patch supports vnflcm v2 API (api_version 2.0.0) as a starting point. It supports less functions than the exsisting v1 API at the moment(Xena) but it will catch up with by the next release (Y). This patch makes supporting another API version easy when it will be supported in the future. Possibly it may thought to add v1 API to this code base. TODO: enhance UT/FT UT/FT is not sufficient at the moment. Additional UTs and FTs will be provided with another patches. Implements: blueprint multi-version-api Implements: blueprint support-nfv-solv3-start-and-terminate-vnf Implements: blueprint support-nfv-solv3-query-vnf-instances Implements: blueprint support-nfv-solv3-query-operation-occurrences Implements: blueprint support-nfv-solv3-subscriptions Change-Id: If76f315d8b3856e0eef9b8808b90f0b15d80d488
68 lines
2.3 KiB
Python
68 lines
2.3 KiB
Python
# Copyright (C) 2021 Nippon Telegraph and Telephone Corporation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from tacker.sol_refactored.common import vnf_instance_utils as inst_utils
|
|
from tacker.tests import base
|
|
|
|
|
|
class TestVnfInstanceUtils(base.BaseTestCase):
|
|
|
|
def test_json_merge_patch(self):
|
|
# patch is not dict.
|
|
target = {"key1", "value1"}
|
|
patch = "text"
|
|
result = inst_utils.json_merge_patch(target, patch)
|
|
self.assertEqual(patch, result)
|
|
|
|
# target is not dict.
|
|
target = "text"
|
|
patch = {"key1", "value1"}
|
|
result = inst_utils.json_merge_patch(target, patch)
|
|
self.assertEqual(patch, result)
|
|
|
|
# normal case
|
|
target = {
|
|
"key1": "value1", # remine
|
|
"key2": "value2", # modify
|
|
"key3": "value3", # delete
|
|
"key4": { # nested
|
|
"key4_1": "value4_1", # remine
|
|
"key4_2": "value4_2", # modify
|
|
"key4_3": {"key4_3_1", "value4_3_1"} # delete
|
|
}
|
|
}
|
|
patch = {
|
|
"key2": "value2_x", # modify
|
|
"key3": None, # delete
|
|
"key4": {
|
|
"key4_2": "value4_2_x", # modify
|
|
"key4_3": None, # delete
|
|
"key4_4": "value4_4" # add
|
|
},
|
|
"key5": "value5" # add
|
|
}
|
|
expected_result = {
|
|
"key1": "value1",
|
|
"key2": "value2_x",
|
|
"key4": {
|
|
"key4_1": "value4_1",
|
|
"key4_2": "value4_2_x",
|
|
"key4_4": "value4_4"
|
|
},
|
|
"key5": "value5"
|
|
}
|
|
result = inst_utils.json_merge_patch(target, patch)
|
|
self.assertEqual(expected_result, result)
|