Versions Compared

Old Version 5

changes.mady.by.user David Perez Caparros

Saved on

compared with

New Version 6

changes.mady.by.user David Perez Caparros

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

titlework in progress

Table of Contents
maxLevel2

System View

Gliffy
size600
nameBBS System View
pagePin1

System Set up 

SO

Custom Workflow Configuration

...

languagebash
themeMidnight
titleSO Custom Workflow Configuration
linenumberstrue

...

INSERT INTO vnf_resource (ORCHESTRATION_MODE, DESCRIPTION, MODEL_UUID, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, TOSCA_NODE_TYPE, RESOURCE_CATEGORY, RESOURCE_SUB_CATEGORY)
VALUES
("HEAT", "CPE VF", "3270fb44-8c01-401d-8854-d548be4f88d9", "bb912fb4-51bf-4e64-be71-8d0b7f7d8ecf", "1.0", "CPE", "org.openecomp.resource.vf.Cpe", "Generic", "Infrastructure"),
("HEAT", "InternetProfile VF", "a48186c1-f75c-40fd-894c-9e8162a60b1a", "a5221da6-7290-4106-b89c-d2cb157b75d1", "1.0", "InternetProfile", "org.openecomp.resource.vf.Internetprofile", "Generic", "Infrastructure"),
("HEAT", "AccessConnectivity VF", "e3445f73-54a5-4935-9154-405d663205b7", "9e2ed8fa-4c33-4e5b-b27f-25778443eba3", "1.0", "AccessConnectivity", "org.openecomp.resource.vf.Accessconnectivity", "Generic", "Infrastructure");

Warning
titlework in progress


Table of Contents
maxLevel2

...

System View

Gliffy
size600
nameBBS System View
pagePin1

System Set up 

SO

Custom Workflow Configuration

Code Block
languagebash
themeMidnight
titleSO Custom Workflow Configuration
linenumberstrue
~/oom/kubernetes# kubectl edit cm dev-so-so-bpmn-infra-app-configmap

  mso:
  ...
       oof:
           BBS_E2E_Service:
+auth: test:testpwd
         callbackEndpoint: http://so-bpmn-infra.onap:8081/mso/WorkflowMessage
         endpoint: https://oof-osdf.onap:8698/api/oof/v1/placement
         timeout: PT30M
       workflow:
+         custom:
+           BBS_E2E_Service:
+             sdnc:
+               need: true
         CreateGenericVNFV1:
           aai:
             volume-group:
               uri: /aai/v6/cloud-infrastructure/volume-groups/volume-group
         default:
           aai:
 ...

## Restart the pod
~/oom/kubernetes# kubectl delete po dev-so-so-bpmn-infra-7556d7f6bc-8fthk

...

Code Block
languagebash
themeMidnight
root@onap-rancher-daily:/home/ubuntu# kubectl exec -ti dev-mariadb-galera-mariadb-galera-0 sh
sh-4.2$ mysql -u root -p
MariaDB [(none)]> use catalogdb;
MariaDB [catalogdb]> selectINSERT * fromINTO vnf_recipe;
...
+-------+---------------------+-----------------------+--------------+--- (NF_ROLE, ACTION, SERVICE_TYPE, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, RECIPE_TIMEOUT) 
VALUES 
	("InternetProfile", "createInstance", "NF", "1.0", "create InternetProfile", "/mso/async/services/CreateSDNCNetworkResource", 180),
	("AccessConnectivity", "createInstance", "NF", "1.0", "create AccessConnectivity", "/mso/async/services/CreateSDNCNetworkResource", 180),
	("CPE", "createInstance", "NF", "1.0", "create CPE", "/mso/async/services/HandlePNF", 180);

MariaDB [catalogdb]> SELECT * FROM vnf_recipe;
...
+-------+---------------------+-----------------------+--------------+-------------+--------------------------------------------------------------------------------+-----------------------------------------------+---------------+----------------+---------------------+--------------------------------------+
| id    | NF_ROLE             | ACTION                | SERVICE_TYPE | VERSION_STR | DESCRIPTION                                                                    | ORCHESTRATION_URI                             | VNF_PARAM_XSD | RECIPE_TIMEOUT | CREATION_TIMESTAMP  | VF_MODULE_ID                         |
+-------+---------------------+-----------------------+--------------+-------------+--------------------------------------------------------------------------------+-----------------------------------------------+---------------+----------------+---------------------+--------------------------------------+
| 10043 | InternetProfile     | createInstance        | NF           | 1.0         | create InternetProfile                                                         | /mso/async/services/CreateSDNCNetworkResource | NULL          |         180000 | 2019-02-18 08:34:39 | NULL                                 |
| 10044 | AccessConnectivity  | createInstance        | NF           | 1.0         | create AccessConnectivity                                                      | /mso/async/services/CreateSDNCNetworkResource | NULL          |         180000 | 2019-02-18 08:34:39 | NULL                                 |
| 10045 | CPE                 | createInstance        | NF           | 1.0         | create CPE                                                                     | /mso/async/services/HandlePNF                 | NULL          |         180000 | 2019-02-18 08:34:39 | NULL                                 |
+-------+---------------------+-----------------------+--------------+-------------+--------------------------------------------------------------------------------+-----------------------------------------------+---------------+----------------+---------------------+--------------------------------------+
...

###
### Modify the MODEL_UUID and MODEL_INVARIANT_UUID for each resource in the SQL query below accordingly to your environment. ###
###
MariaDB [catalogdb]> INSERT INTO vnf_resource (ORCHESTRATION_MODE, DESCRIPTION, MODEL_UUID, MODEL_INVARIANT_UUID, MODEL_VERSION, MODEL_NAME, TOSCA_NODE_TYPE, RESOURCE_CATEGORY, RESOURCE_SUB_CATEGORY) 
VALUES 
	("HEAT", "CPE VF", "3270fb44-8c01-401d--+--------------------------------------+
...
8854-d548be4f88d9", "bb912fb4-51bf-4e64-be71-8d0b7f7d8ecf", "1.0", "CPE", "org.openecomp.resource.vf.Cpe", "Generic", "Infrastructure"),
	("HEAT", "InternetProfile VF", "a48186c1-f75c-40fd-894c-9e8162a60b1a", "a5221da6-7290-4106-b89c-d2cb157b75d1", "1.0", "InternetProfile", "org.openecomp.resource.vf.Internetprofile", "Generic", "Infrastructure"),
	("HEAT", "AccessConnectivity VF", "e3445f73-54a5-4935-9154-405d663205b7", "9e2ed8fa-4c33-4e5b-b27f-25778443eba3", "1.0", "AccessConnectivity", "org.openecomp.resource.vf.Accessconnectivity", "Generic", "Infrastructure");

MariaDB [catalogdb]> selectSELECT * fromFROM vnf_resource;
+--------------------+-----------------------+---------------------+--------------------------------------+-----------------+-----------------+--------------------------------------+---------------+--------------------+----------------------------------------------+-----------------------------+-------------------+-----------------------+
| ORCHESTRATION_MODE | DESCRIPTION           | CREATION_TIMESTAMP  | MODEL_UUID                           | AIC_VERSION_MIN | AIC_VERSION_MAX | MODEL_INVARIANT_UUID                 | MODEL_VERSION | MODEL_NAME         | TOSCA_NODE_TYPE                              | HEAT_TEMPLATE_ARTIFACT_UUID | RESOURCE_CATEGORY | RESOURCE_SUB_CATEGORY |
+--------------------+-----------------------+---------------------+--------------------------------------+-----------------+-----------------+--------------------------------------+---------------+--------------------+----------------------------------------------+-----------------------------+-------------------+-----------------------+
| HEAT               | CPE VF                | 20192020-0501-1520 2218:1102:0723 | 8f5fe6233270fb44-c5e38c01-4ab3401d-90f98854-3a28daea6601d548be4f88d9 | NULL            | NULL            | 0ee07fe6bb912fb4-a15651bf-4e594e64-9deebe71-09a775d02bca8d0b7f7d8ecf | 1.0           | CPE                | org.openecomp.resource.vf.Cpe                | NULL                        | Generic           | Infrastructure        |
| HEAT               | InternetProfile VF    | 20192020-0501-1520 2218:1102:1123 | a8de16d8a48186c1-0d1af75c-4a1940fd-80ac894c-2bcb2790e9a69e8162a60b1a | NULL            | NULL            | acbe6358a5221da6-6ce47290-43a94106-9385b89c-111fe5cadad3d2cb157b75d1 | 1.0           | InternetProfile    | org.openecomp.resource.vf.Internetprofile    | NULL                        | Generic           | Infrastructure        |
| HEAT               | AccessConnectivity VF | 20192020-0501-1520 2218:1102:1323 | b464fd87e3445f73-366354a5-46c94935-adc59154-6f7d9e98ff26405d663205b7 | NULL            | NULL            | 53018dba9e2ed8fa-c9344c33-415d4e5b-b4b1b27f-0b1cae9553b825778443eba3 | 1.0           | AccessConnectivity | org.openecomp.resource.vf.Accessconnectivity | NULL                        | Generic           | Infrastructure        |
+--------------------+-----------------------+---------------------+----------------
+----------------------+-----------------+------+-----------+----------+----------------------------+---------------+--------------------+-----------------+-----------------------------+---------+-------------------+-+-------------------+-----------------------+

Modify the MODEL_UUID and MODEL_INVARIANT_UUID for each resource in the SQL query below accordingly to your environment.

Code Block
languagesql
themeMidnight
INSERT INTO `vnf_resource` (`ORCHESTRATION_MODE`, `DESCRIPTION`, `CREATION_TIMESTAMP`, `MODEL_UUID`, `AIC_VERSION_MIN`, `AIC_VERSION_MAX`, `MODEL_INVARIANT_UUID`, `MODEL_VERSION`, `MODEL_NAME`, `TOSCA_NODE_TYPE`, `HEAT_TEMPLATE_ARTIFACT_UUID`, `RESOURCE_CATEGORY`, `RESOURCE_SUB_CATEGORY`)
VALUES
	('HEAT', 'CPE VF', '2019-05-15 22:11:07', '8f5fe623-c5e3-4ab3-90f9-3a28daea6601', NULL, NULL, '0ee07fe6-a156-4e59-9dee-09a775d02bca', '1.0', 'CPE', 'org.openecomp.resource.vf.Cpe', NULL, 'Generic', 'Infrastructure'),
	('HEAT', 'InternetProfile VF', '2019-05-15 22:11:11', 'a8de16d8-0d1a-4a19-80ac-2bcb2790e9a6', NULL, NULL, 'acbe6358-6ce4-43a9-9385-111fe5cadad3', '1.0', 'InternetProfile', 'org.openecomp.resource.vf.Internetprofile', NULL, 'Generic', 'Infrastructure'),
	('HEAT', 'AccessConnectivity VF', '2019-05-15 22:11:13', 'b464fd87-3663-46c9-adc5-6f7d9e98ff26', NULL, NULL, '53018dba-c934-415d-b4b1-0b1cae9553b8', '1.0', 'AccessConnectivity', 'org.openecomp.resource.vf.Accessconnectivity', NULL, 'Generic', 'Infrastructure');

----------------------------------------+-----------------------------+-------------------+-----------------------+


Adding is_pnf flag to CPE resource input in catalogdb database. Needed in DoCreateResource BPMN for pausing the flow until a PNF is ready

Code Block
languagesql
themeMidnight
INSERT INTO `vnf_resource_customization` (`ID`, `MODEL_CUSTOMIZATION_UUID`, `MODEL_INSTANCE_NAME`, `MIN_INSTANCES`, `MAX_INSTANCES`, `AVAILABILITY_ZONE_MAX_COUNT`, `NF_TYPE`, `NF_ROLE`, `NF_FUNCTION`, `NF_NAMING_CODE`, `MULTI_STAGE_DESIGN`, `CREATION_TIMESTAMP`, `VNF_RESOURCE_MODEL_UUID`, `SERVICE_MODEL_UUID`, `RESOURCE_INPUT`, `CDS_BLUEPRINT_NAME`, `CDS_BLUEPRINT_VERSION`, `SKIP_POST_INSTANTIATION_CONFIGURATION`)
VALUES
	(16, '0cea1cea-e4e4-4c91-be41-675e183a8983', 'CPE 0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', '2019-05-21 11:15:42', '8f5fe623-c5e3-4ab3-90f9-3a28daea6601', '0187be8c-8efb-4531-97fa-dbe984ed9cdb', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\",\\\"is_pnf\\\":\\\"ont_0_is_pnf|true\\\"}', NULL, NULL, 1),
    (19, '23084710-92d1-433f-9ee8-1ab6b52968e4', 'AccessConnectivity 0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', '2019-07-10 11:15:42', '36f3f843-5592-42d3-a873-c9ab6a404742', 'b70a200b-53a9-46ef-b920-f386d8fad8c3', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\"}', NULL, NULL, 1),
    (22, 'a10e2b3d-4454-4e77-867c-7ce5076bd9c2', 'InternetProfile 0', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'false', '2019-07-10 11:16:42', 'd9c46bd0-8847-407e-a9bd-1e58c369d6c1', 'b70a200b-53a9-46ef-b920-f386d8fad8c3', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\"}', NULL, NULL, 1);

...