openstack/tacker
Code Issues Proposed changes

Merge "Fix invalid vim type for ETSI's definition"

Browse Source
This commit is contained in:
Zuul 2024-09-12 18:48:23 +00:00 committed by Gerrit Code Review
commit 54ea927f70
24 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v1/samples/vnflcm/change-ext-conn-request.json
View File

@ -54,7 +54,7 @@
"vimConnectionInfo": [
{
"id": "vim-uuid",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": "dummy-vimid",
"interfaceInfo": {
"key1": "value1",

2
doc/source/cli/cli-etsi-vnflcm.rst
View File

@ -332,7 +332,7 @@ Result:
| | { |
| | "id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1", |
| | "vimId": "fa9fa87e-8be2-425d-85e1-08778d82d95f", |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2", |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2", |
| | "interfaceInfo": {}, |
| | "accessInfo": {}, |
| | "extra": {} |

2
doc/source/user/etsi_getting_started.rst
View File

@ -706,7 +706,7 @@ Instantiate VNF
| | { |
| | "id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1", |
| | "vimId": "662e5f4f-3b16-4ca6-b560-28b62dd0e13b", |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2", |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2", |
| | "interfaceInfo": {}, |
| | "accessInfo": {}, |
| | "extra": {} |

2
doc/source/user/etsi_vnf_change_external_vnf_connectivity.rst
View File

@ -83,7 +83,7 @@ definition file before running command for changing the connectivity.
"vimConnectionInfo": [
{
"id": "79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": "79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56",
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"

2
doc/source/user/etsi_vnf_deployment_as_vm_with_tosca.rst
View File

@ -455,7 +455,7 @@ An example of a param file with optional parameters:
{
"id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1",
"vimId": "8a0fd79d-e224-4c27-85f5-ee79c6e0d870",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"
}
],
"localizationLanguage": "ja",

2
doc/source/user/etsi_vnf_deployment_as_vm_with_user_data.rst
View File

@ -215,7 +215,7 @@ An example of a param file with optional parameters:
{
"id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1", #Set a random uuid.
"vimId": "8a0fd79d-e224-4c27-85f5-ee79c6e0d870", #Set the uuid of the VIM to use
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"
}
],
"additionalParams": {

2
doc/source/user/etsi_vnf_error_handling.rst
View File

@ -288,7 +288,7 @@ Result:
| | \"subnetId\": \"d290cae3-0dbc-44a3-a043-1a50ded04a64\"}]}}]}]}, {\"cpdId\": \"VDU2_CP2\", \"cpConfig\": [{\"cpProtocolData\": [{\"layerProtocol\": \"IP_OVER_ETHERNET\", \"ipOverEthernet\": {\"ipAddresses\": [{\"type\": |
| | \"IPV4\", \"fixedAddresses\": [\"22.22.1.20\"], \"subnetId\": \"d290cae3-0dbc-44a3-a043-1a50ded04a64\"}]}}]}]}]}], \"extManagedVirtualLinks\": [{\"id\": \"8f9d8da0-2386-4f00-bbb0-860f50d32a5a\", \"vnfVirtualLinkDescId\": |
| | \"internalVL1\", \"resourceId\": \"0e498d08-ed3a-4212-83e0-1b6808f6fcb6\"}, {\"id\": \"11d68761-aab7-419c-955c-0c6497f13692\", \"vnfVirtualLinkDescId\": \"internalVL2\", \"resourceId\": \"38a8d4ba- |
| | ac1b-41a2-a92b-ff2a3e5e9b12\"}], \"vimConnectionInfo\": [{\"id\": \"79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56\", \"vimType\": \"ETSINFV.OPENSTACK_KEYSTONE.v_2\", \"vimConnectionId\": \"79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56\", |
| | ac1b-41a2-a92b-ff2a3e5e9b12\"}], \"vimConnectionInfo\": [{\"id\": \"79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56\", \"vimType\": \"ETSINFV.OPENSTACK_KEYSTONE.V_2\", \"vimConnectionId\": \"79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56\", |
| | \"interfaceInfo\": {\"endpoint\": \"http://127.0.0.1/identity\"}, \"accessInfo\": {\"username\": \"nfv_user\", \"region\": \"RegionOne\", \"password\": \"devstack\", \"tenant\": \"1994d69783d64c00aadab564038c2fd7\"}}], |
| | \"additionalParams\": {\"lcm-operation-user-data\": \"./UserData/lcm_user_data.py\", \"lcm-operation-user-data-class\": \"SampleUserData\"}}" |
| resourceChanges | {} |

2
doc/source/user/etsi_vnf_healing.rst
View File

@ -555,7 +555,7 @@ Result:
| | { |
| | "id": "79a97d01-e5f3-4eaa-b2bc-8f513ecb8a56", |
| | "vimId": null, |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2", |
| | "vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2", |
| | "interfaceInfo": { |
| | "endpoint": "http://127.0.0.1/identity" |
| | }, |

2
samples/etsi_getting_started/tosca/lcm_instantiate_request/sample_param_file.json
View File

@ -4,7 +4,7 @@
{
"id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1",
"vimId": "${vim_uuid}",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"
}
]
}

2
samples/etsi_getting_started/userdata/lcm_instantiate_request/sample_param_file.json
View File

@ -33,7 +33,7 @@
{
"id": "e24f9796-a8e9-4cb0-85ce-5920dcddafa1",
"vimId": "${vim_uuid}",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"
}
],
"additionalParams": {

2
samples/free5gc/vnf/change_ext_conn/changeExtVnfConnectivityRequest.json
View File

@ -25,7 +25,7 @@
],
"vimConnectionInfo": [{
"id": "3cc2c4ff-525c-48b4-94c9-29247223322f",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": "c3369b54-e376-4423-bb61-afd255900fea",
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"

2
tacker/tests/compliance/base.py
View File

@ -63,7 +63,7 @@ INSTANTIATION_BODY = {
{
'id': None,
'vimId': None,
'vimType': 'ETSINFV.OPENSTACK_KEYSTONE.v_2'
'vimType': 'ETSINFV.OPENSTACK_KEYSTONE.V_2'
}
]
}

2
tacker/tests/functional/sol/vnflcm/base.py
View File

@ -201,7 +201,7 @@ def _create_instantiate_vnf_request_body(flavour_id,
request_body["vimConnectionInfo"] = [
{"id": uuidutils.generate_uuid(),
"vimId": vim_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"}]
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"}]
if add_params:
request_body["additionalParams"] = add_params

6
tacker/tests/functional/sol/vnflcm/fake_vnflcm.py
View File

@ -262,7 +262,7 @@ class VnfInstances:
ext_mngd_networks_id),
"vimConnectionInfo": [{
"id": uuidsentinel.vim_connection_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": uuidsentinel.vim_connection_id,
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"
@ -301,7 +301,7 @@ class VnfInstances:
ext_mngd_networks_id),
"vimConnectionInfo": [{
"id": uuidsentinel.vim_connection_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": uuidsentinel.vim_connection_id,
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"
@ -452,7 +452,7 @@ class VnfInstances:
],
"vimConnectionInfo": [{
"id": uuidsentinel.vim_connection_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": uuidsentinel.vim_connection_id,
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"

4
tacker/tests/functional/sol/vnflcm/test_vnf_instance.py
View File

@ -251,7 +251,7 @@ class VnfLcmTest(base.BaseTackerTest):
request_body["vimConnectionInfo"] = [
{"id": uuidutils.generate_uuid(),
"vimId": vim_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"}]
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"}]
return request_body
@ -464,7 +464,7 @@ class VnfLcmTest(base.BaseTackerTest):
request_body["vimConnectionInfo"] = [
{"id": uuidutils.generate_uuid(),
"vimId": vim_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"}]
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"}]
return request_body

2
tacker/tests/functional/sol_enhanced_policy/base.py
View File

@ -546,7 +546,7 @@ class BaseEnhancedPolicyTest(object):
else:
raise Exception('vim_user_project_map is needed.')
image_name = "cirros-0.5.2-x86_64-disk"
image_path = test_etc_sample("nfv/common/Files/images",
image_path = test_etc_sample("etsi/nfv/common/Files/images",
f"{image_name}.img")
image_data = {
'disk_format': 'qcow2',

4
tacker/tests/functional/sol_enhanced_policy/sol/test_policy_vnflcm_apis_v1.py
View File

@ -133,7 +133,7 @@ class VnflcmAPIsV1Test(VnflcmAPIsV1Base):
request_body["vimConnectionInfo"] = [
{"id": uuidutils.generate_uuid(),
"vimId": vim_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2"}]
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2"}]
return request_body
@ -175,7 +175,7 @@ class VnflcmAPIsV1Test(VnflcmAPIsV1Base):
username, inst_id, request_body, expected_status_code)
def _change_ext_conn_vnf_request(self, vim_id=None, ext_vl=None,
vim_type="ETSINFV.OPENSTACK_KEYSTONE.v_2"):
vim_type="ETSINFV.OPENSTACK_KEYSTONE.V_2"):
request_body = {}
if ext_vl:
request_body["extVirtualLinks"] = ext_vl

2
tacker/tests/functional/sol_multi_tenant/vnflcm/fake_vnflcm.py
View File

@ -212,7 +212,7 @@ class VnfInstances:
ext_mngd_networks_id),
"vimConnectionInfo": [{
"id": uuidsentinel.vim_connection_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"vimConnectionId": uuidsentinel.vim_connection_id,
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"

2
tacker/tests/functional/sol_separated_nfvo/vnflcm/fake_grant.py
View File

@ -46,7 +46,7 @@ class Grant:
return [{
"id": uuidsentinel.vim_connection_id,
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"interfaceInfo": {
"endpoint": "http://127.0.0.1/identity"
},

2
tacker/tests/unit/objects/test_change_ext_conn_req.py
View File

@ -75,7 +75,7 @@ class ChangeExtConnRequestTestCase(base.TestCase):
vim_connection_info = [{
"id": "6b0ff598-60d6-49b4-a907-a1111de52d92",
"vim_id": uuidsentinel.vim_id,
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"interface_info": {
"endpoint": "endpoint_value"},
"access_info": {

2
tacker/tests/unit/objects/test_grant.py
View File

@ -29,7 +29,7 @@ class GrantTestCase(base.TestCase):
vim_connection_info = [{
"id": "6b0ff598-60d6-49b4-a907-a1111de52d92",
"vim_id": uuidsentinel.vim_id,
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"interface_info": {
"endpoint": "endpoint_value"},
"access_info": {

2
tacker/tests/unit/objects/test_instantiate_vnf_req.py
View File

@ -233,7 +233,7 @@ class InstantiateVnfRequestTestCase(base.TestCase):
vim_connection_info = [{
"id": "6b0ff598-60d6-49b4-a907-a1111de52d92",
"vim_id": uuidsentinel.vim_id,
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"access_info": {}}]
vnf_info_data = {'ext_managed_virtual_links': [ext_mg_vl],

2
tacker/tests/unit/vnflcm/test_controller.py
View File

@ -1196,7 +1196,7 @@ class TestController(base.TestCase):
vim_info = {
"id": "7d24979f-491e-4fa3-8da1-4a374fe28d55",
"vim_id": None,
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"interface_info": {"endpoint": "http://127.0.0.1/identity"},
"access_info": {
"username": "nfv_user",

2
tacker/tests/unit/vnfm/infra_drivers/openstack/fixture_data/fixture_data_utils.py
View File

@ -476,7 +476,7 @@ def get_change_ext_conn_request():
vim_connection_info = [{
"id": uuidsentinel.vim_connection_id,
"vim_id": uuidsentinel.vim_id,
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.v_2",
"vim_type": "ETSINFV.OPENSTACK_KEYSTONE.V_2",
"interface_info": {
"endpoint": "endpoint_value"},
"access_info": {