openstack
/
tacker
Code Issues Proposed changes

Fix vimConnectionId in ResourceHandle 

This patch changes the value corresponding to the vimConnectionId field
in the ResouceHandle data structure in the DB from the vimId value of
VimConnectionInfo to the key of the map of VimConnectionInfo.

Closes-Bug: #2046321
Change-Id: I3245d5ccb97bbf9dce8364ba37b68f99ed3af6d2
This commit is contained in:
YiFeng 2023-12-13 15:08:15 +09:00
parent a21195575a
commit 07908e7739
19 changed files with 234 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api-ref/source/v2/samples/vnffm/list-vnffm-alarm-response.json
View File

@ -4,7 +4,7 @@
"managedObjectId": "c61314d0-f583-4ab3-a457-46426bce02d3",
"rootCauseFaultyResource": {
"faultyResource": {
"vimConnectionId": "0d57e928-86a4-4445-a4bd-1634edae73f3",
"vimConnectionId": "vim1",
"resourceId": "4e6ccbe1-38ec-4b1b-a278-64de09ba01b3",
"vimLevelResourceType": "OS::Nova::Server"
},

2
api-ref/source/v2/samples/vnffm/show-vnffm-alarm-response.json
View File

@ -3,7 +3,7 @@
"managedObjectId": "c61314d0-f583-4ab3-a457-46426bce02d3",
"rootCauseFaultyResource": {
"faultyResource": {
"vimConnectionId": "0d57e928-86a4-4445-a4bd-1634edae73f3",
"vimConnectionId": "vim1",
"resourceId": "4e6ccbe1-38ec-4b1b-a278-64de09ba01b3",
"vimLevelResourceType": "OS::Nova::Server"
},

4
api-ref/source/v2/samples/vnflcm/change-ext-conn-request.json
View File

@ -91,7 +91,7 @@
"id": "38a38351-fbed-4637-8dcd-01ca1f69d4bb",
"resourceId": "bbe38e96-8395-4b7f-a7da-67058922df1c",
"resourceProviderId": "Company",
"vimConnectionId": "defb2f96-5670-4bef-8036-27bf61267fc1"
"vimConnectionId": "vim1"
},
{
"extCps": [
@ -151,7 +151,7 @@
"id": "97a82200-328a-44f6-98cb-bfdf27c359c1",
"resourceId": "b47d25bd-f1d8-4136-b7e7-ac8754977661",
"resourceProviderId": "Company",
"vimConnectionId": "defb2f96-5670-4bef-8036-27bf61267fc1"
"vimConnectionId": "vim1"
}
],
"vimConnectionInfo": {

4
api-ref/source/v2/samples/vnflcm/change-vnfpkg-request.json
View File

@ -120,7 +120,7 @@
"id": "38a38351-fbed-4637-8dcd-01ca1f69d4bb",
"resourceId": "bbe38e96-8395-4b7f-a7da-67058922df1c",
"resourceProviderId": "Company",
"vimConnectionId": "defb2f96-5670-4bef-8036-27bf61267fc1"
"vimConnectionId": "vim1"
},
{
"extCps": [
@ -180,7 +180,7 @@
"id": "97a82200-328a-44f6-98cb-bfdf27c359c1",
"resourceId": "b47d25bd-f1d8-4136-b7e7-ac8754977661",
"resourceProviderId": "Company",
"vimConnectionId": "defb2f96-5670-4bef-8036-27bf61267fc1"
"vimConnectionId": "vim1"
}
],
"vimConnectionInfo": {

10
api-ref/source/v2/samples/vnflcm/fail-vnflcm-operation-occurrence-response.json
View File

@ -166,7 +166,7 @@
"id": "e2cc5431-eb8d-4208-b8e1-3b766c123279",
"networkResource": {
"resourceId": "d2565a88-aea8-4999-b52f-a220b59df5ea",
"vimConnectionId": "0f093d21-cd8f-4826-aeee-27cd9305a209",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -180,7 +180,7 @@
"id": "b5d1f4b8-fb87-4155-a4e9-6619a1b7097f",
"networkResource": {
"resourceId": "d785e039-215c-4e6e-951c-79959d8c531c",
"vimConnectionId": "0f093d21-cd8f-4826-aeee-27cd9305a209",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -196,7 +196,7 @@
"id": "55cf75b7-6c73-455e-8bd2-07f31047672d",
"storageResource": {
"resourceId": "5c6956bc-9e1b-490f-8592-a490da200a2c",
"vimConnectionId": "0f093d21-cd8f-4826-aeee-27cd9305a209",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
"virtualStorageDescId": "VirtualStorage"
@ -214,7 +214,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "c9920a04-cf74-4e42-be89-a2fec2f89e48",
"vimConnectionId": "0f093d21-cd8f-4826-aeee-27cd9305a209",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "43c29ba1-6037-49a6-a73a-b83484e7dc4e",
@ -234,7 +234,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "dd5731bb-50f1-47e5-b1bf-ae0c34fd646e",
"vimConnectionId": "0f093d21-cd8f-4826-aeee-27cd9305a209",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "d9d06660-35d2-4c90-b9f0-139f38731e75",

30
api-ref/source/v2/samples/vnflcm/list-vnf-instance-response.json
View File

@ -121,7 +121,7 @@
"id": "b8b0430e-169c-442a-9c48-8fb8c4c3db4d",
"resourceHandle": {
"resourceId": "7fe18c76-85eb-4e90-ba95-df6e6bad2cd6",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -131,7 +131,7 @@
"id": "2950622a-ded8-4160-88dc-2bf0f02529dd",
"resourceHandle": {
"resourceId": "07dc4096-49c7-478d-986a-fd132efd573a",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -191,7 +191,7 @@
"id": "c19db045-8526-4d2d-8daf-819905f9b3fb",
"resourceHandle": {
"resourceId": "c1f49f87-37ff-437b-84a0-91a346fdec55",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -200,7 +200,7 @@
"id": "51043a84-78f4-4bbe-832d-a7fcfbd3cb23",
"resourceHandle": {
"resourceId": "88bc7eee-0893-4892-b0d3-d58d1c2293a8",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -263,7 +263,7 @@
"id": "c9008244-6561-49cf-a9a3-6218034e6b02",
"resourceHandle": {
"resourceId": "3c89dfce-2039-41ad-a60b-6be6488bbca6",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -272,7 +272,7 @@
"id": "f190426f-63a7-42a5-ad12-44c6bc464f13",
"resourceHandle": {
"resourceId": "a0db5863-e420-4191-a2bb-c8536b091bda",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -301,7 +301,7 @@
"id": "0357ecab-bdd8-403f-a91b-b80f287b536f",
"storageResource": {
"resourceId": "0ea498c7-a740-4b16-b8fd-93dbd5d8ee7d",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
"virtualStorageDescId": "VirtualStorage"
@ -313,7 +313,7 @@
"id": "e651053a-e17e-47e3-9665-6ec028873040",
"networkResource": {
"resourceId": "98d5c67b-c7f8-4293-890c-011184b6574b",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
@ -323,7 +323,7 @@
"id": "d5ec9027-dba4-4b53-be4a-7bbad1ab9f51",
"resourceHandle": {
"resourceId": "42fe1697-30a7-4a79-8547-71de0c43c8b5",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -333,7 +333,7 @@
"id": "a5f21c6d-3ba4-4843-b3cc-cc4c8b37be72",
"resourceHandle": {
"resourceId": "5bd09199-1409-46b1-9cd4-191e3fb7c9cb",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -344,7 +344,7 @@
"id": "5efa5ab4-4237-4b41-9e39-7f4565992acc",
"networkResource": {
"resourceId": "be459310-e24d-4430-a0b9-b9ad391f4e5e",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
@ -354,7 +354,7 @@
"id": "c02a75f8-a809-49c6-b6dc-bbda31928ef0",
"resourceHandle": {
"resourceId": "86c5a181-4232-4937-ba73-5c494f0d267a",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -364,7 +364,7 @@
"id": "bfb260e7-cfdd-45ee-8fb9-64f51d8c2064",
"resourceHandle": {
"resourceId": "de311602-f52b-44a7-af11-15b97ca28beb",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -390,7 +390,7 @@
{
"computeResource": {
"resourceId": "edda96a2-b4c2-48ca-a06f-31976f9d9653",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "d0c3f928-adca-4c9b-aaa3-1a8b43a9460d",
@ -426,7 +426,7 @@
{
"computeResource": {
"resourceId": "66a84389-8234-4394-929f-68e0ea77fde1",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "60d4ffe7-275c-458d-9f40-0a7b43f895fd",

10
api-ref/source/v2/samples/vnflcm/list-vnflcm-operation-occurrence-response.json
View File

@ -323,7 +323,7 @@
"id": "74411165-b969-4539-99a9-3ffdbc8b1ae7",
"networkResource": {
"resourceId": "5f4cc2e3-7bce-4e90-ad1a-0d43812a4af5",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -337,7 +337,7 @@
"id": "5b696739-1a38-4df2-8f95-f3826fc3b0b7",
"networkResource": {
"resourceId": "349a4dbb-41e9-4db9-b044-0653507b9728",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -353,7 +353,7 @@
"id": "359a20f2-2c66-49b4-bc4e-3cf673513688",
"storageResource": {
"resourceId": "496a70a0-c9df-43ce-8e49-3c708583eef0",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
"virtualStorageDescId": "VirtualStorage"
@ -371,7 +371,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "7fceb009-ed81-4b95-ad4d-8487870cac48",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "c4453bf6-d185-4d4f-9e6b-fb745bf21229",
@ -391,7 +391,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "2f0f1954-0b5f-48a6-8591-f05ca2c3c74e",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "795985f6-f2c1-4a32-b318-6ac424ddf2bf",

30
api-ref/source/v2/samples/vnflcm/show-vnf-instance-response.json
View File

@ -120,7 +120,7 @@
"id": "b8b0430e-169c-442a-9c48-8fb8c4c3db4d",
"resourceHandle": {
"resourceId": "7fe18c76-85eb-4e90-ba95-df6e6bad2cd6",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -130,7 +130,7 @@
"id": "2950622a-ded8-4160-88dc-2bf0f02529dd",
"resourceHandle": {
"resourceId": "07dc4096-49c7-478d-986a-fd132efd573a",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -190,7 +190,7 @@
"id": "c19db045-8526-4d2d-8daf-819905f9b3fb",
"resourceHandle": {
"resourceId": "c1f49f87-37ff-437b-84a0-91a346fdec55",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -199,7 +199,7 @@
"id": "51043a84-78f4-4bbe-832d-a7fcfbd3cb23",
"resourceHandle": {
"resourceId": "88bc7eee-0893-4892-b0d3-d58d1c2293a8",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -262,7 +262,7 @@
"id": "c9008244-6561-49cf-a9a3-6218034e6b02",
"resourceHandle": {
"resourceId": "3c89dfce-2039-41ad-a60b-6be6488bbca6",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -271,7 +271,7 @@
"id": "f190426f-63a7-42a5-ad12-44c6bc464f13",
"resourceHandle": {
"resourceId": "a0db5863-e420-4191-a2bb-c8536b091bda",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -300,7 +300,7 @@
"id": "0357ecab-bdd8-403f-a91b-b80f287b536f",
"storageResource": {
"resourceId": "0ea498c7-a740-4b16-b8fd-93dbd5d8ee7d",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
"virtualStorageDescId": "VirtualStorage"
@ -312,7 +312,7 @@
"id": "e651053a-e17e-47e3-9665-6ec028873040",
"networkResource": {
"resourceId": "98d5c67b-c7f8-4293-890c-011184b6574b",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
@ -322,7 +322,7 @@
"id": "d5ec9027-dba4-4b53-be4a-7bbad1ab9f51",
"resourceHandle": {
"resourceId": "42fe1697-30a7-4a79-8547-71de0c43c8b5",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -332,7 +332,7 @@
"id": "a5f21c6d-3ba4-4843-b3cc-cc4c8b37be72",
"resourceHandle": {
"resourceId": "5bd09199-1409-46b1-9cd4-191e3fb7c9cb",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -343,7 +343,7 @@
"id": "5efa5ab4-4237-4b41-9e39-7f4565992acc",
"networkResource": {
"resourceId": "be459310-e24d-4430-a0b9-b9ad391f4e5e",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
@ -353,7 +353,7 @@
"id": "c02a75f8-a809-49c6-b6dc-bbda31928ef0",
"resourceHandle": {
"resourceId": "86c5a181-4232-4937-ba73-5c494f0d267a",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
},
@ -363,7 +363,7 @@
"id": "bfb260e7-cfdd-45ee-8fb9-64f51d8c2064",
"resourceHandle": {
"resourceId": "de311602-f52b-44a7-af11-15b97ca28beb",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Port"
}
}
@ -389,7 +389,7 @@
{
"computeResource": {
"resourceId": "edda96a2-b4c2-48ca-a06f-31976f9d9653",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "d0c3f928-adca-4c9b-aaa3-1a8b43a9460d",
@ -425,7 +425,7 @@
{
"computeResource": {
"resourceId": "66a84389-8234-4394-929f-68e0ea77fde1",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "60d4ffe7-275c-458d-9f40-0a7b43f895fd",

10
api-ref/source/v2/samples/vnflcm/show-vnflcm-operation-occurrence-response.json
View File

@ -161,7 +161,7 @@
"id": "74411165-b969-4539-99a9-3ffdbc8b1ae7",
"networkResource": {
"resourceId": "5f4cc2e3-7bce-4e90-ad1a-0d43812a4af5",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -175,7 +175,7 @@
"id": "5b696739-1a38-4df2-8f95-f3826fc3b0b7",
"networkResource": {
"resourceId": "349a4dbb-41e9-4db9-b044-0653507b9728",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPortIds": [
@ -191,7 +191,7 @@
"id": "359a20f2-2c66-49b4-bc4e-3cf673513688",
"storageResource": {
"resourceId": "496a70a0-c9df-43ce-8e49-3c708583eef0",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
"virtualStorageDescId": "VirtualStorage"
@ -209,7 +209,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "7fceb009-ed81-4b95-ad4d-8487870cac48",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "c4453bf6-d185-4d4f-9e6b-fb745bf21229",
@ -229,7 +229,7 @@
"changeType": "ADDED",
"computeResource": {
"resourceId": "2f0f1954-0b5f-48a6-8591-f05ca2c3c74e",
"vimConnectionId": "03e608b2-e7d4-44fa-bd84-74fb24be3ed5",
"vimConnectionId": "vim1",
"vimLevelResourceType": "OS::Nova::Server"
},
"id": "795985f6-f2c1-4a32-b318-6ac424ddf2bf",

126
tacker/db/migration/migrate_to_v2.py
View File

@ -33,6 +33,7 @@ from tacker.db.nfvo import nfvo_db_plugin
from tacker.db.vnfm import vnfm_db
from tacker import objects
from tacker.sol_refactored.common import vim_utils
from tacker.sol_refactored.common import vnf_instance_utils as inst_utils
from tacker.sol_refactored.infra_drivers.openstack import heat_utils
from tacker.sol_refactored import objects as objects_v2
from tacker.sol_refactored.objects.v2 import fields as v2fields
@ -195,7 +196,8 @@ def get_all_vnfs(context):
return vnf_ids
def _to_vnf_instance_v2_instantiated_vnf_info(inst_info, vnf, op_occs):
def _to_vnf_instance_v2_instantiated_vnf_info(inst_info, vnf, op_occs,
vim_connection_info=None):
if not inst_info:
return None
fields = {
@ -207,25 +209,30 @@ def _to_vnf_instance_v2_instantiated_vnf_info(inst_info, vnf, op_occs):
"extVirtualLinkInfo":
_to_ext_virtual_link_info_v2(
inst_info.ext_virtual_link_info,
inst_info.vnf_virtual_link_resource_info, op_occs),
inst_info.vnf_virtual_link_resource_info, op_occs,
vim_connection_info),
"extManagedVirtualLinkInfo":
_to_ext_managed_virtual_link_info_v2(
inst_info.ext_managed_virtual_link_info),
inst_info.ext_managed_virtual_link_info,
vim_connection_info),
"monitoringParameters": _to_monitoring_parameters(vnf.attributes),
"localizationLanguage": _to_localization_language(vnf.attributes),
"vnfcResourceInfo":
_to_vnfc_resource_info_v2(
inst_info.vnfc_resource_info,
inst_info.ext_virtual_link_info,
inst_info.vnf_virtual_link_resource_info),
inst_info.vnf_virtual_link_resource_info,
vim_connection_info),
"vnfVirtualLinkResourceInfo":
_to_vnf_virtual_link_resource_info_v2(
inst_info.vnf_virtual_link_resource_info,
inst_info.ext_virtual_link_info,
inst_info.ext_managed_virtual_link_info),
inst_info.ext_managed_virtual_link_info,
vim_connection_info),
"virtualStorageResourceInfo":
_to_virtual_storage_resource_info_v2(
inst_info.virtual_storage_resource_info),
inst_info.virtual_storage_resource_info,
vim_connection_info),
"vnfcInfo": _to_vnfc_info_v2(inst_info.vnfc_resource_info)}
return objects_v2.VnfInstanceV2_InstantiatedVnfInfo(**fields)
@ -345,7 +352,8 @@ def _to_ip_over_ethernet_address_info_v2_ip_addresses(ip_addresses):
return ip_over_eth_add_info_v2_ip_addresses
def _to_ext_virtual_link_info_v2(ext_vls, vnf_vl_rscs, op_occs):
def _to_ext_virtual_link_info_v2(ext_vls, vnf_vl_rscs, op_occs,
vim_connection_info=None):
ext_vls_v2 = []
for ext_vl in ext_vls:
_ext_vl = ext_vl.get("tacker_object.data")
@ -353,18 +361,22 @@ def _to_ext_virtual_link_info_v2(ext_vls, vnf_vl_rscs, op_occs):
_ext_vl.get("resource_handle").get("tacker_object.data")
fields = {
"id": _ext_vl.get("id"),
"resourceHandle": _to_resource_handle(resource_handle_data),
"resourceHandle": _to_resource_handle(
resource_handle_data, vim_connection_info),
"extLinkPorts":
_to_ext_link_port_info_v2(_ext_vl.get("id"), vnf_vl_rscs),
_to_ext_link_port_info_v2(
_ext_vl.get("id"), vnf_vl_rscs, vim_connection_info),
"currentVnfExtCpData":
_to_current_vnf_ext_cp_data(_ext_vl.get("id"), op_occs)}
ext_vls_v2.append(objects_v2.ExtVirtualLinkInfoV2(**fields))
return ext_vls_v2
def _to_resource_handle(resource_handle_data):
def _to_resource_handle(resource_handle_data, vim_connection_info=None):
fields = {
'vimConnectionId': resource_handle_data.get("vim_connection_id"),
'vimConnectionId': _get_vim_key_by_id(
resource_handle_data.get("vim_connection_id"),
vim_connection_info),
'resourceProviderId': resource_handle_data.get("resource_provider_id"),
'resourceId': resource_handle_data.get("resource_id"),
'vimLevelResourceType':
@ -373,7 +385,8 @@ def _to_resource_handle(resource_handle_data):
return resource_handle
def _to_ext_link_port_info_v2(ext_vl_id, vnf_vl_res_infos):
def _to_ext_link_port_info_v2(ext_vl_id, vnf_vl_res_infos,
vim_connection_info=None):
ext_link_port_infos_v2 = []
for vnf_vl_res_info in vnf_vl_res_infos:
_vnf_vl_res_info = vnf_vl_res_info.get("tacker_object.data")
@ -386,7 +399,8 @@ def _to_ext_link_port_info_v2(ext_vl_id, vnf_vl_res_infos):
fields = {
"id": _link_port.get("id"),
"resourceHandle":
_to_resource_handle(resource_handle_data),
_to_resource_handle(
resource_handle_data, vim_connection_info),
"cpInstanceId": _link_port.get("cp_instance_id")}
ext_link_port_infos_v2.append(
objects_v2.ExtLinkPortInfoV2(**fields))
@ -482,7 +496,8 @@ def _to_ip_over_eth_address_data_ip_addresses_address_range(address_range):
IpOverEthernetAddressData_IpAddresses_AddressRange(**fields)
def _to_ext_managed_virtual_link_info_v2(ext_mng_vl_infos):
def _to_ext_managed_virtual_link_info_v2(ext_mng_vl_infos,
vim_connection_info=None):
ext_mng_vl_infos_v2 = []
for ext_mng_vl_info in ext_mng_vl_infos:
_ext_mng_vl_info = ext_mng_vl_info.get("tacker_object.data")
@ -492,15 +507,17 @@ def _to_ext_managed_virtual_link_info_v2(ext_mng_vl_infos):
"id": _ext_mng_vl_info.get("id"),
"vnfVirtualLinkDescId":
_ext_mng_vl_info.get("vnf_virtual_link_desc_id"),
"networkResource": _to_resource_handle(resource_handle_data),
"networkResource": _to_resource_handle(
resource_handle_data, vim_connection_info),
"vnfLinkPorts": _to_vnf_link_port_info_v2(
_ext_mng_vl_info.get("vnf_link_ports", []))}
_ext_mng_vl_info.get("vnf_link_ports", []),
vim_connection_info)}
ext_mng_vl_infos_v2.append(
objects_v2.ExtManagedVirtualLinkInfoV2(**fields))
return ext_mng_vl_infos_v2
def _to_vnf_link_port_info_v2(vnf_link_ports):
def _to_vnf_link_port_info_v2(vnf_link_ports, vim_connection_info=None):
vnf_link_port_infos_v2 = []
for vnf_link_port in vnf_link_ports:
_vnf_link_port = vnf_link_port.get("tacker_object.data")
@ -513,14 +530,16 @@ def _to_vnf_link_port_info_v2(vnf_link_ports):
# the value of cpInstanceId but the object doesn't exist at the moment.
fields = {
"id": _vnf_link_port.get("id"),
"resourceHandle": _to_resource_handle(resource_handle_data),
"resourceHandle": _to_resource_handle(
resource_handle_data, vim_connection_info),
"cpInstanceId": _vnf_link_port.get("cp_instance_id"),
"cpInstanceType": "EXT_CP"}
vnf_link_port_infos_v2.append(objects_v2.VnfLinkPortInfoV2(**fields))
return vnf_link_port_infos_v2
def _to_vnfc_resource_info_v2(vnfc_rsc_infos, ext_vl_infos, vnf_vl_res_infos):
def _to_vnfc_resource_info_v2(vnfc_rsc_infos, ext_vl_infos, vnf_vl_res_infos,
vim_connection_info=None):
vnfc_rsc_infos_v2 = []
for vnfc_rsc_info in vnfc_rsc_infos:
_vnfc_rsc_info = vnfc_rsc_info.get("tacker_object.data")
@ -529,7 +548,8 @@ def _to_vnfc_resource_info_v2(vnfc_rsc_infos, ext_vl_infos, vnf_vl_res_infos):
fields = {
"id": _vnfc_rsc_info.get("id"),
"vduId": _vnfc_rsc_info.get("vdu_id"),
"computeResource": _to_resource_handle(resource_handle_data),
"computeResource": _to_resource_handle(
resource_handle_data, vim_connection_info),
"storageResourceIds":
_vnfc_rsc_info.get("storage_resource_ids"),
"vnfcCpInfo":
@ -610,7 +630,8 @@ def _to_localization_language(vnf_attributes):
def _to_vnf_virtual_link_resource_info_v2(vl_rsc_infos,
ext_vl_infos, ext_managed_vl_infos):
ext_vl_infos, ext_managed_vl_infos,
vim_connection_info=None):
vl_rsc_infos_v2 = []
ext_vl_ids = [ext_vl_info.get("tacker_object.data").get("id") for
ext_vl_info in ext_vl_infos]
@ -627,15 +648,17 @@ def _to_vnf_virtual_link_resource_info_v2(vl_rsc_infos,
fields = {
"id": _vl_rsc_info.get("id"),
"vnfVirtualLinkDescId": vl_desc_id,
"networkResource": _to_resource_handle(resource_handle_data),
"networkResource": _to_resource_handle(
resource_handle_data, vim_connection_info),
"vnfLinkPorts": _to_vnf_link_port_info_v2(
_vl_rsc_info.get("vnf_link_ports"))}
_vl_rsc_info.get("vnf_link_ports"), vim_connection_info)}
vl_rsc_infos_v2.append(
objects_v2.VnfVirtualLinkResourceInfoV2(**fields))
return vl_rsc_infos_v2
def _to_virtual_storage_resource_info_v2(vstorage_infos):
def _to_virtual_storage_resource_info_v2(vstorage_infos,
vim_connection_info=None):
vstorage_infos_v2 = []
for vstorage_info in vstorage_infos:
_vstorage_info = vstorage_info.get("tacker_object.data")
@ -645,7 +668,8 @@ def _to_virtual_storage_resource_info_v2(vstorage_infos):
"id": _vstorage_info.get("id"),
"virtualStorageDescId":
_vstorage_info.get("virtual_storage_desc_id"),
"storageResource": _to_resource_handle(resource_handle_data)}
"storageResource": _to_resource_handle(
resource_handle_data, vim_connection_info)}
vstorage_infos_v2.append(
objects_v2.VirtualStorageResourceInfoV2(**fields))
return vstorage_infos_v2
@ -734,6 +758,8 @@ def create_vnf_instance_v2(context, vnf_id):
nfvo = nfvo_db_plugin.NfvoPluginDb()
_vim_infos = \
[nfvo.get_vim(context, vim.id, mask_password=False) for vim in _vims]
vim_connection_info = _to_vim_connection_info(
_vnf_instance.vim_connection_info, _vim_infos)
inst_v2 = objects_v2.VnfInstanceV2(
id=_vnf_instance.id,
@ -746,11 +772,10 @@ def create_vnf_instance_v2(context, vnf_id):
vnfdVersion=_vnf_instance.vnfd_version,
vnfConfigurableProperties=_to_vnf_configurable_properties(
_vnf.attributes),
vimConnectionInfo=_to_vim_connection_info(
_vnf_instance.vim_connection_info, _vim_infos),
vimConnectionInfo=vim_connection_info,
instantiationState=_vnf_instance.instantiation_state,
instantiatedVnfInfo=_to_vnf_instance_v2_instantiated_vnf_info(
_vnf_info, _vnf, _vnf_op_occs),
_vnf_info, _vnf, _vnf_op_occs, vim_connection_info),
metadata=_vnf_instance.vnf_metadata,)
if inst_v2.instantiatedVnfInfo:
_set_cp_instance_type(inst_v2)
@ -807,12 +832,16 @@ def _create_operation_params_v2(dict_operation_params_v1, operation):
return cls.from_dict(fields)
def _create_resource_changes_v2(dict_resource_changes):
def _create_resource_changes_v2(dict_resource_changes,
vim_connection_info=None):
resource_changes = dict_resource_changes
# create affected_vnfcs_v2 list
affected_vnfcs_v2 = []
for affected_vnfc in resource_changes["affected_vnfcs"]:
compute_res = affected_vnfc["compute_resource"]
compute_res["vim_connection_id"] = _get_vim_key_by_id(
compute_res["vim_connection_id"], vim_connection_info)
fields = {
"id": affected_vnfc["id"],
'vduId': affected_vnfc["vdu_id"],
@ -835,6 +864,9 @@ def _create_resource_changes_v2(dict_resource_changes):
# create affected_virtual_links_v2 list
affected_vls_v2 = []
for affected_vl in resource_changes["affected_virtual_links"]:
network_res = affected_vl["network_resource"]
network_res["vim_connection_id"] = _get_vim_key_by_id(
network_res["vim_connection_id"], vim_connection_info)
fields = {
'id': affected_vl["id"],
'vnfVirtualLinkDescId':
@ -856,6 +888,10 @@ def _create_resource_changes_v2(dict_resource_changes):
affected_vstorages_v2 = []
for affected_vstorage \
in resource_changes.get("affected_virtual_storages", []):
storage_res = affected_vstorage["storage_resource"]
storage_res["vim_connection_id"] = _get_vim_key_by_id(
storage_res["vim_connection_id"], vim_connection_info)
fields = {
'id': affected_vstorage["id"],
'virtualStorageDescId':
@ -909,7 +945,8 @@ def _create_vnf_info_modifications_v2(
def _create_list_of_ext_virtual_link_infos_v2(
list_of_dict_changed_ext_connectivity, operation, operation_param_v2):
list_of_dict_changed_ext_connectivity, operation, operation_param_v2,
vim_connection_info=None):
changed_ext_connectivity = list_of_dict_changed_ext_connectivity
if changed_ext_connectivity is None or \
@ -921,7 +958,9 @@ def _create_list_of_ext_virtual_link_infos_v2(
# create resourceHandle
resource_handle_v1 = ext_vl_info["resource_handle"]
fields = {
'vimConnectionId': resource_handle_v1["vim_connection_id"],
'vimConnectionId': _get_vim_key_by_id(
resource_handle_v1["vim_connection_id"],
vim_connection_info),
'resourceId': resource_handle_v1["resource_id"],
'vimLevelResourceType':
resource_handle_v1["vim_level_resource_type"],
@ -936,7 +975,9 @@ def _create_list_of_ext_virtual_link_infos_v2(
resource_handle_v1 = ext_link_port["resource_handle"]
fields = {
'vimConnectionId':
resource_handle_v1["vim_connection_id"],
_get_vim_key_by_id(
resource_handle_v1["vim_connection_id"],
vim_connection_info),
'resourceProviderId': None,
'resourceId': resource_handle_v1["resource_id"],
'vimLevelResourceType':
@ -968,6 +1009,20 @@ def _create_list_of_ext_virtual_link_infos_v2(
return ext_vl_infos_v2
def _get_vim_key_by_id(vim_id, vim_connection_info):
if not vim_id:
return vim_id
# Note: If no vimId matching vim_id is found in vim_connection_info,
# "vim_0" is returned as vim_connection_id.
vim_connection_id = "vim_0"
if vim_connection_info:
for key, value in vim_connection_info.items():
if value.vimId == vim_id:
vim_connection_id = key
break
return vim_connection_id
def _create_vnf_lcm_op_occ_v2(context, op_occ_v1):
# create v2 ProblemDetails
_ProblemDetails_v2 = None
@ -985,8 +1040,10 @@ def _create_vnf_lcm_op_occ_v2(context, op_occ_v1):
# create VnfLcmOpOccV2_ResourceChanges
_dict_resource_changes = jsonutils.loads(op_occ_v1.resource_changes)
inst_v2 = inst_utils.get_inst(context, op_occ_v1.vnf_instance_id)
_VnfLcmOpOccV2_ResourceChanges = \
_create_resource_changes_v2(_dict_resource_changes)
_create_resource_changes_v2(
_dict_resource_changes, inst_v2.vimConnectionInfo)
# create VnfInfoModificationsV2
_VnfInfoModificationsV2 = None
@ -1008,7 +1065,8 @@ def _create_vnf_lcm_op_occ_v2(context, op_occ_v1):
_list_of_ExtVirtualLinkInfoV2 = \
_create_list_of_ext_virtual_link_infos_v2(
_list_of_dict_changed_ext_conn, _operation, _OperationParam_v2)
_list_of_dict_changed_ext_conn, _operation, _OperationParam_v2,
inst_v2.vimConnectionInfo)
vnf_lcm_op_occ_v2 = objects_v2.VnfLcmOpOccV2(
id=op_occ_v1.id,

12
tacker/sol_refactored/common/vnf_instance_utils.py
View File

@ -73,14 +73,16 @@ def json_merge_patch(target, patch):
return patch
def select_vim_info(vim_connection_info):
def select_vim_info(vim_connection_info, return_key=False):
# NOTE: It is assumed that vimConnectionInfo has only one item
# at the moment. If there are multiple items, it is uncertain
# which item is selected.
for vim_info in vim_connection_info.values():
if vim_info.vimType == 'kubernetes':
vim_info.vimType = 'ETSINFV.KUBERNETES.V_1'
return vim_info
for key, value in vim_connection_info.items():
if value.vimType == 'kubernetes':
value.vimType = 'ETSINFV.KUBERNETES.V_1'
if return_key:
return key, value
return value
def check_metadata_format(metadata):

5
tacker/sol_refactored/infra_drivers/openstack/openstack.py
View File

@ -1383,7 +1383,8 @@ class Openstack(object):
flavour_id = req.flavourId
else:
flavour_id = inst.instantiatedVnfInfo.flavourId
vim_info = inst_utils.select_vim_info(inst.vimConnectionInfo)
vim_key, vim_info = inst_utils.select_vim_info(
inst.vimConnectionInfo, return_key=True)
vducp_nodes = vnfd.get_vducp_nodes(flavour_id)
storage_reses = self._get_checked_reses(
@ -1401,7 +1402,7 @@ class Openstack(object):
return objects.ResourceHandle(
resourceId=res['physical_resource_id'],
vimLevelResourceType=res['resource_type'],
vimConnectionId=vim_info.vimId)
vimConnectionId=vim_key)
storage_infos = [
objects.VirtualStorageResourceInfoV2(

2
tacker/tests/functional/sol_enhanced_policy/sol/test_policy_vnflcm_apis_v2.py
View File

@ -169,7 +169,7 @@ class VnflcmAPIsV2VNFBase(CommonVnfLcmTest, BaseEnhancedPolicyTest):
ext_vl_1 = {
"id": uuidutils.generate_uuid(),
"vimConnectionId": vim_id_1,
"vimConnectionId": "vim1",
"resourceProviderId": uuidutils.generate_uuid(),
"resourceId": net_ids['ft-net1'],
"extCps": [

2
tacker/tests/functional/sol_enhanced_policy/sol_kubernetes/test_policy_cnflcm_apis_v2.py
View File

@ -273,7 +273,7 @@ class VnflcmAPIsV2CNFBase(BaseVnfLcmKubernetesV2Test, BaseEnhancedPolicyTest):
ext_vl_1 = {
"id": uuidutils.generate_uuid(),
"vimConnectionId": vim_id_1,
"vimConnectionId": "vim1",
"resourceProviderId": uuidutils.generate_uuid(),
"resourceId": net_ids['ft-net1'],
"extCps": [

12
tacker/tests/functional/sol_separated_nfvo_v2/fake_grant_v2.py
View File

@ -30,7 +30,7 @@ class GrantV2:
{
"id": uuidsentinel.zone_id,
"zoneId": "nova",
"vimConnectionId": uuidsentinel.vim_connection_id
"vimConnectionId": "vim1"
}
]
@ -86,7 +86,7 @@ class GrantV2:
for req_add_resource in req_add_resources:
res_add_resource = {
"resourceDefinitionId": req_add_resource['id'],
"vimConnectionId": uuidsentinel.vim_connection_id
"vimConnectionId": "vim1"
}
if req_add_resource['type'] == 'COMPUTE':
if placement_constraints:
@ -132,7 +132,7 @@ class GrantV2:
zone_dict = {
"id": uuidutils.generate_uuid(),
"zoneId": name,
"vimConnectionId": uuidsentinel.vim_connection_id
"vimConnectionId": "vim1"
}
zone.append(zone_dict)
return zone
@ -156,7 +156,7 @@ class GrantV2:
for req_update_resource in req_update_resources:
res_update_resource = {
"resourceDefinitionId": req_update_resource['id'],
"vimConnectionId": uuidsentinel.vim_connection_id
"vimConnectionId": "vim1"
}
if req_update_resource['type'] == 'COMPUTE':
if placement_constraints:
@ -202,7 +202,7 @@ class GrantV2:
def _generate_flavour(vdu, flavour_id_dict):
if flavour_id_dict.get(vdu):
return {
"vimConnectionId": uuidsentinel.vim_connection_id,
"vimConnectionId": "vim1",
"vnfdVirtualComputeDescId": vdu,
"vimFlavourId": flavour_id_dict[vdu]
}
@ -212,7 +212,7 @@ class GrantV2:
def _generate_image(vdu, image_id_dict):
if image_id_dict.get(vdu):
return {
"vimConnectionId": uuidsentinel.vim_connection_id,
"vimConnectionId": "vim1",
"vnfdSoftwareImageId": vdu,
"vimSoftwareImageId": image_id_dict[vdu]
}

18
tacker/tests/functional/sol_v2_common/paramgen.py
View File

@ -197,8 +197,7 @@ def instantiate_vnf_max(net_ids, subnets, ports, auth_url, user_data=False):
# - 1
# - 1..N (2 or more)
vim_id_1 = uuidutils.generate_uuid()
vim_id_2 = uuidutils.generate_uuid()
vim_id_1 = "vim1"
link_port_id_1 = uuidutils.generate_uuid()
link_port_id_2 = uuidutils.generate_uuid()
@ -393,7 +392,7 @@ def instantiate_vnf_max(net_ids, subnets, ports, auth_url, user_data=False):
"extManagedMultisiteVirtualLinkId": uuidutils.generate_uuid()
}
vim_1 = {
"vimId": vim_id_1,
"vimId": uuidutils.generate_uuid(),
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3",
"interfaceInfo": {"endpoint": auth_url},
"accessInfo": {
@ -407,7 +406,7 @@ def instantiate_vnf_max(net_ids, subnets, ports, auth_url, user_data=False):
"extra": {"dummy-key": "dummy-val"}
}
vim_2 = {
"vimId": vim_id_2,
"vimId": uuidutils.generate_uuid(),
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3",
"interfaceInfo": {"endpoint": auth_url},
"accessInfo": {
@ -688,8 +687,7 @@ def change_ext_conn_max(net_ids, subnets, auth_url):
# - 1
# - 1..N (2 or more)
vim_id_1 = uuidutils.generate_uuid()
vim_id_2 = uuidutils.generate_uuid()
vim_id_1 = "vim1"
ext_vl_1 = {
"id": uuidutils.generate_uuid(),
@ -748,7 +746,7 @@ def change_ext_conn_max(net_ids, subnets, auth_url):
]
}
vim_1 = {
"vimId": vim_id_1,
"vimId": uuidutils.generate_uuid(),
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3",
"interfaceInfo": {"endpoint": auth_url},
"accessInfo": {
@ -762,7 +760,7 @@ def change_ext_conn_max(net_ids, subnets, auth_url):
"extra": {"dummy-key": "dummy-val"}
}
vim_2 = {
"vimId": vim_id_2,
"vimId": uuidutils.generate_uuid(),
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3",
"interfaceInfo": {"endpoint": auth_url},
"accessInfo": {
@ -1644,14 +1642,14 @@ def change_vnf_pkg_individual_vnfc_max(vnfd_id, net_ids, subnet_ids):
"extManagedVirtualLinks": [{
"id": uuidutils.generate_uuid(),
"vnfVirtualLinkDescId": "internalVL1",
"vimConnectionId": uuidutils.generate_uuid(),
"vimConnectionId": "vim1",
"resourceProviderId": "Company",
"resourceId": net_ids['net_mgmt'],
"extManagedMultisiteVirtualLinkId": uuidutils.generate_uuid()
}, {
"id": uuidutils.generate_uuid(),
"vnfVirtualLinkDescId": "internalVL2",
"vimConnectionId": uuidutils.generate_uuid(),
"vimConnectionId": "vim1",
"resourceProviderId": "Company",
"resourceId": net_ids['net_mgmt'],
"extManagedMultisiteVirtualLinkId": uuidutils.generate_uuid()

18
tacker/tests/unit/db/test_db_migration_to_v2.py
View File

@ -28,6 +28,7 @@ from tacker.db.migration import migrate_to_v2
from tacker.db.nfvo import nfvo_db
from tacker.db.vnfm import vnfm_db
from tacker import objects
from tacker.sol_refactored.common import vnf_instance_utils as inst_utils
from tacker.sol_refactored import objects as objects_v2
from tacker.sol_refactored.objects.v2 import fields as fields_v2
from tacker.tests.base import BaseTestCase
@ -1305,7 +1306,22 @@ class TestDbMigrationToV2(SqlTestCase):
vnfc_res_infos_v1[i].id)
self.assertEqual(vnfc_info_v2.vnfcState, "STARTED")
def test_create_vnf_lcm_op_occ_v2(self):
@mock.patch.object(inst_utils, 'get_inst')
def test_create_vnf_lcm_op_occ_v2(self, mock_inst):
vim_connection_info = objects_v2.VimConnectionInfo.from_dict({
"vimId": uuidutils.generate_uuid(),
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3"
})
mock_inst.return_value = objects_v2.VnfInstanceV2(
id=uuidutils.generate_uuid(),
vnfdId=uuidutils.generate_uuid(),
vnfProvider='provider',
vnfProductName='product name',
vnfSoftwareVersion='software version',
vnfdVersion='vnfd version',
instantiationState='INSTANTIATED',
vimConnectionInfo={"vim_0": vim_connection_info}
)
vnf_lcm_op_occs_v1 = self.vnf_lcm_op_occs
vnf_lcm_op_occs_v2 = \
migrate_to_v2.create_vnf_lcm_op_occs_v2(self.context,

94
tacker/tests/unit/sol_refactored/infra_drivers/openstack/test_openstack.py
View File

@ -1465,7 +1465,7 @@ _inst_info_example = {
"id": "res_id_VDU1_2",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_2",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -1512,7 +1512,7 @@ _inst_info_example = {
"id": "res_id_VDU2_1",
"vduId": "VDU2",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_1",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -1790,7 +1790,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP1_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1799,7 +1799,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP1_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1808,7 +1808,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU2_CP1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1876,7 +1876,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP2_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1885,7 +1885,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP2_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1936,7 +1936,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP3_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP3_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1946,7 +1946,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP3_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP3_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1956,7 +1956,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU2_CP3",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP3",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -1971,7 +1971,7 @@ _expected_inst_info = {
"id": "res_id_VDU1_2",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_2",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2018,7 +2018,7 @@ _expected_inst_info = {
"id": "res_id_VDU1_1",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_1",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2065,7 +2065,7 @@ _expected_inst_info = {
"id": "res_id_VDU2",
"vduId": "VDU2",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2110,7 +2110,7 @@ _expected_inst_info = {
"id": "res_id_internalVL2",
"vnfVirtualLinkDescId": "internalVL2",
"networkResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_internalVL2",
"vimLevelResourceType": "OS::Neutron::Net"
},
@ -2118,7 +2118,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP4_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP4_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2128,7 +2128,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP4_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP4_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2138,7 +2138,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU2_CP4",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP4",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2151,7 +2151,7 @@ _expected_inst_info = {
"id": "res_id_internalVL3",
"vnfVirtualLinkDescId": "internalVL3",
"networkResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_internalVL3",
"vimLevelResourceType": "OS::Neutron::Net"
},
@ -2159,7 +2159,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP5_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP5_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2169,7 +2169,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU1_CP5_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP5_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2179,7 +2179,7 @@ _expected_inst_info = {
{
"id": "res_id_VDU2_CP5",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP5",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2194,7 +2194,7 @@ _expected_inst_info = {
"id": "res_id_VirtualStorage_1",
"virtualStorageDescId": "VirtualStorage",
"storageResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VirtualStorage_1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
@ -2204,7 +2204,7 @@ _expected_inst_info = {
"id": "res_id_VirtualStorage_2",
"virtualStorageDescId": "VirtualStorage",
"storageResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VirtualStorage_2",
"vimLevelResourceType": "OS::Cinder::Volume"
},
@ -2437,7 +2437,7 @@ _expected_inst_info_change_ext_conn = {
{
"id": "res_id_VDU1_CP1_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2446,7 +2446,7 @@ _expected_inst_info_change_ext_conn = {
{
"id": "res_id_VDU1_CP1_2",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_2",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2485,7 +2485,7 @@ _expected_inst_info_change_ext_conn = {
{
"id": "res_id_VDU2_CP1_modified",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP1_modified",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2533,7 +2533,7 @@ _expected_inst_info_change_ext_conn = {
{
"id": "res_id_VDU1_CP2_1_modified",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_1_modified",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2542,7 +2542,7 @@ _expected_inst_info_change_ext_conn = {
{
"id": "res_id_VDU1_CP2_2_modified",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_2_modified",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2587,7 +2587,7 @@ _expected_inst_info_change_ext_conn = {
"id": "res_id_VDU1_2",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_2",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2634,7 +2634,7 @@ _expected_inst_info_change_ext_conn = {
"id": "res_id_VDU1_1",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_1",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2681,7 +2681,7 @@ _expected_inst_info_change_ext_conn = {
"id": "res_id_VDU2",
"vduId": "VDU2",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -2849,7 +2849,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP1_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2858,7 +2858,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP1_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP1_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2867,7 +2867,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU2_CP1_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP1_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2930,7 +2930,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP2_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2940,7 +2940,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP2_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP2_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2950,7 +2950,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU2_CP2_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP2_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -2965,7 +2965,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU1_1",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_1",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -3003,7 +3003,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU1_0",
"vduId": "VDU1",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_0",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -3041,7 +3041,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU2_0",
"vduId": "VDU2",
"computeResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_0",
"vimLevelResourceType": "OS::Nova::Server"
},
@ -3079,7 +3079,7 @@ _expected_inst_info_S = {
"id": "res_id_internalVL2",
"vnfVirtualLinkDescId": "internalVL2",
"networkResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_internalVL2",
"vimLevelResourceType": "OS::Neutron::Net"
},
@ -3087,7 +3087,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP3_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP3_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -3097,7 +3097,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU1_CP3_1",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1_CP3_1",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -3107,7 +3107,7 @@ _expected_inst_info_S = {
{
"id": "res_id_VDU2_CP3_0",
"resourceHandle": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2_CP3_0",
"vimLevelResourceType": "OS::Neutron::Port"
},
@ -3122,7 +3122,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU1-VirtualStorage_0",
"virtualStorageDescId": "VDU1-VirtualStorage",
"storageResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1-VirtualStorage_0",
"vimLevelResourceType": "OS::Cinder::Volume"
},
@ -3134,7 +3134,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU1-VirtualStorage_1",
"virtualStorageDescId": "VDU1-VirtualStorage",
"storageResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU1-VirtualStorage_1",
"vimLevelResourceType": "OS::Cinder::Volume"
},
@ -3146,7 +3146,7 @@ _expected_inst_info_S = {
"id": "res_id_VDU2-VirtualStorage_0",
"virtualStorageDescId": "VDU2-VirtualStorage",
"storageResource": {
"vimConnectionId": "vim_id_1",
"vimConnectionId": "vim1",
"resourceId": "res_id_VDU2-VirtualStorage_0",
"vimLevelResourceType": "OS::Cinder::Volume"
},

2
tacker/tests/unit/sol_refactored/samples/fakes_for_fm.py
View File

@ -19,7 +19,7 @@ alarm_example = {
"managedObjectId": "c61314d0-f583-4ab3-a457-46426bce02d3",
"rootCauseFaultyResource": {
"faultyResource": {
"vimConnectionId": "0d57e928-86a4-4445-a4bd-1634edae73f3",
"vimConnectionId": "vim1",
"resourceId": "4e6ccbe1-38ec-4b1b-a278-64de09ba01b3",
"vimLevelResourceType": "OS::Nova::Server"
},