Page Comparison

...

Code Block

language	bash
theme	Midnight

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]> INSERT INTO vnf_recipe (NF_ROLE, ACTION, SERVICE_TYPE, VERSION_STR, DESCRIPTION, ORCHESTRATION_URI, VNF_PARAM_XSD, RECIPE_TIMEOUT) 
VALUES 
	("InternetProfile", "createInstance", "NF", "1.0", "create InternetProfile", "/mso/async/services/CreateSDNCNetworkResource", '{"operationType":"AccessConnectivity"}', 180000),
	("AccessConnectivity", "createInstance", "NF", "1.0", "create AccessConnectivity", "/mso/async/services/CreateSDNCNetworkResource", '{"operationType":"InternetProfile"}', 180000),
	("CPE", "createInstance", "NF", "1.0", "create CPE", "/mso/async/services/HandlePNF", NULL, 180000);

MariaDB [catalogdb]> select * from vnf_recipe where NF_ROLE IN ('AccessConnectivity','InternetProfile', 'CPE');
+-------+--------------------+----------------+--------------+-------------+---------------------------+-----------------------------------------------+----------------------------------------+----------------+---------------------+--------------+
| id    | NF_ROLE            | ACTION         | SERVICE_TYPE | VERSION_STR | DESCRIPTION               | ORCHESTRATION_URI                             | VNF_PARAM_XSD                          | RECIPE_TIMEOUT | CREATION_TIMESTAMP  | VF_MODULE_ID |
+-------+--------------------+----------------+--------------+-------------+---------------------------+-----------------------------------------------+----------------------------------------+----------------+---------------------+--------------+
| 10048 | InternetProfile    | createInstance | NF           | 1.0         | create InternetProfile    | /mso/async/services/CreateSDNCNetworkResource | {"operationType":"InternetProfile"}    |        1800000 | 2020-01-20 17:43:07 | NULL         |
| 10051 | AccessConnectivity | createInstance | NF           | 1.0         | create AccessConnectivity | /mso/async/services/CreateSDNCNetworkResource | {"operationType":"AccessConnectivity"} |        1800000 | 2020-01-20 17:43:07 | NULL         |
| 10054 | CPE                | createInstance | NF           | 1.0         | create CPE                | /mso/async/services/HandlePNF                 | NULL                                   |        1800000 | 2020-01-20 17:43:07 | NULL         |
+-------+--------------------+----------------+--------------+-------------+---------------------------+-----------------------------------------------+----------------------------------------+----------------+---------------------+--------------+
3 rows in set (0.00 sec)

###
### 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]> SELECT * FROM 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                | 2020-01-20 18:02:23 | 3270fb44-8c01-401d-8854-d548be4f88d9 | NULL            | NULL            | bb912fb4-51bf-4e64-be71-8d0b7f7d8ecf | 1.0           | CPE                | org.openecomp.resource.vf.Cpe                | NULL                        | Generic           | Infrastructure        |
| HEAT               | InternetProfile VF    | 2020-01-20 18:02:23 | a48186c1-f75c-40fd-894c-9e8162a60b1a | NULL            | NULL            | a5221da6-7290-4106-b89c-d2cb157b75d1 | 1.0           | InternetProfile    | org.openecomp.resource.vf.Internetprofile    | NULL                        | Generic           | Infrastructure        |
| HEAT               | AccessConnectivity VF | 2020-01-20 18:02:23 | e3445f73-54a5-4935-9154-405d663205b7 | NULL            | NULL            | 9e2ed8fa-4c33-4e5b-b27f-25778443eba3 | 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

language	sql
theme	Midnight

INSERT INTO vnf_resource_customization (MODEL_CUSTOMIZATION_UUID, MODEL_INSTANCE_NAME, MULTI_STAGE_DESIGN, VNF_RESOURCE_MODEL_UUID, SERVICE_MODEL_UUID, RESOURCE_INPUT, SKIP_POST_INSTANTIATION_CONFIGURATION)
VALUES
    ( '0cea1cea-e4e4-4c91-be41-675e183a8983', 'CPE 0', 'false', '3270fb44-8c01-401d-8854-d548be4f88d9', '8b0aaed8-911a-4a8f-b09b-e614dee38258', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\",\\\"is_pnf\\\":\\\"ont_0_is_pnf|true\\\"}', 1),
    ( '23084710-92d1-433f-9ee8-1ab6b52968e4', 'AccessConnectivity 0', 'false', 'e3445f73-54a5-4935-9154-405d663205b7', '8b0aaed8-911a-4a8f-b09b-e614dee38258', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\"}', 1),
    ( 'a10e2b3d-4454-4e77-867c-7ce5076bd9c2', 'InternetProfile 0', 'false', 'a48186c1-f75c-40fd-894c-9e8162a60b1a', '8b0aaed8-911a-4a8f-b09b-e614dee38258', '{\\\"nf_naming\\\":\\\"true\\\",\\\"skip_post_instantiation_configuration\\\":\\\"true\\\",\\\"multi_stage_design\\\":\\\"false\\\",\\\"availability_zone_max_count\\\":\\\"1\\\"}', 1);

We need to ensure that the order in which the resources are processed by SO engine is correct. In BBS case, the PNF resource should go right after VnfVirtualLink (NOTE: the BPMN flow waits until PNF is ready in order to create AccessConnectivity and InternetProfile resources)

Code Block

language	bash
theme	Midnight

MariaDB [catalogdb]> UPDATE service SET RESOURCE_ORDER = "VnfVirtualLink,CPE,AccessConnectivity,InternetProfile,PonUni,OltNni,OntNni" WHERE MODEL_NAME="BBS_E2E_Service";
MariaDB [catalogdb]> SELECT RESOURCE_ORDER FROM service WHERE MODEL_NAME="BBS_E2E_Service";
+----------------------------------------------------------------------------+
| RESOURCE_ORDER                                                             |
+----------------------------------------------------------------------------+
| VnfVirtualLink,CPE,AccessConnectivity,InternetProfile,PonUni,OltNni,OntNni |
+----------------------------------------------------------------------------+

MariaDB [catalogdb]> DELETE FROM network_resource_customization_to_service WHERE SERVICE_MODEL_UUID="<put-here-the-service-model-UUID>";

Info

title	SO Database Workaround

Currently, the existing RESOURCE ORDER displayed above for the service requires the VNF-Virtual-link to be orchestrated first. Due to missing functionality in DGs to handle this orchestration for the ODN network (modeled as VNF-Virtual-Link) in BBS use case, we need to delete a database entry so that service decomposition does not contain any VNF virtual links that need to be orchestrated.

Code Block

language	bash
theme	Midnight

DMaaP Message Router

Create required topics

...

Versions Compared

Old Version 21

New Version 22

Key

DMaaP Message Router