Page Comparison

...

• Core NS instantiation using the Macro flow through NBI Automation.
• Instantiation, Day0, Day1 and Day2 configuration with help of SO, SDNC, Multicloud (k8s-plugin) and CDS.
• There are two E2E workflows involved i.e Macro POST (Instantiation) and PUT (Modify Config) operations.

CBA package Download:

Original Upload

https://gerrit.onap.org/r/c/ccsdk/cds/+/113518 (obsolete)

https://gerrit.onap.org/r/gitweb?p=ccsdk/cds.git;a=commit;h=a8fecedef955a594716d96a4c5b5c2564385db1c (obsolete)

Current Repository

https://git.onap.org/ccsdk/cds/tree/components/model-catalog/blueprint-model/service-blueprint/5GC_Simulator_CNF_CDS

Helm Package:

...

Image Removed

Service:

Instantiation Type = Macro

Image Removed

Set below properties values at Service level in SDC

• Set “skip_post_instantiation_configuration = false” in SDC to enable post
• controller_actor = CDS
• Add cba package details in sdnc properties
  • sdnc_artifact_name
  • sdnc_model_name
  • sdnc_model_version

...

NBI Helm Chart Update:

Add the environment variable (which are highlighted in below pic) in below path.

path: oom/kubernetes/nbi/templates/deployment.yaml 

Image Removed

Then, you will need to change also the following parameters :

• ONAP_LCPCLOUDREGIONID = the same value of ONAP_K8SCLOUDREGIONID
• ONAP_CLOUDOWNER = the same value of ONAP_CLOUDOWNER
• ONAP_TENANTID = the same tenantid value stored into AAI for the given ONAP_LCPCLOUDREGIONID and ONAP_CLOUDOWNER

SO Maria DB:

SDC:

VSP:

Image Removed

...

SDC:

VSP:

Image Added

VF:
Set below properties values at VF level in SDC

Image Added

Service:

Instantiation Type = Macro

Image Added

Set below properties values at Service level in SDC

• Set “skip_post_instantiation_configuration = false” in SDC to enable post
• controller_actor = CDS
• Add cba package details in sdnc properties
  • sdnc_artifact_name
  • sdnc_model_name
  • sdnc_model_version

Image Added

NBI Updates:

WARNING:  The default override values file supplied with your distribution likely has this entry for nbi.

nbi:
  enabled: false
  config:
    # openstack configuration
    openStackRegion: "Yolo"
    openStackVNFTenantId: "1234"

This entry will cause changes you make to configure NBI to be overwritten when the NBI pod is updated and that portion from config: and the succeeding lines must be removed.

path: oom/kubernetes/nbi/templates/deployment.yaml 

The default values can remain as is as the values are specified in a values.yaml file.  Prior instructions added k8s config variables but that as of Istanbul is no longer needed.

            - name: ONAP_LCPCLOUDREGIONID
              value: {{ .Values.config.openStackRegion }}
            - name: ONAP_TENANTID
              value: {{ .Values.config.openStackVNFTenantId | quote }}
            - name: ONAP_CLOUDOWNER
              value: {{ .Values.config.cloudOwner }}
            - name: ONAP_K8SCLOUDREGIONID
              value: {{ .Values.config.k8sCloudRegionId }}
            - name: ONAP_K8SCLOUDOWNER
              value: {{ .Values.config.k8sCloudOwner }}

path: oom/kubernetes/nbi/values.yaml

The Values that come with the deployment are as below.

# application configuration
config:
  loglevel: INFO
  logstashServiceName: log-ls
  logstashPort: 5044
  cloudOwner: CloudOwner
  k8sCloudRegionId: k8sregionfour
  k8sCloudOwner: k8scloudowner4
  ecompInstanceId: OOM
  openStackRegion: RegionOne
  openStackVNFTenantId: aaaa

Two of these values (cloudOwner and openStackRegion need to be set to the k8s values;

# application configuration
config:
  loglevel: INFO
  logstashServiceName: log-ls
  logstashPort: 5044
  cloudOwner: k8scloudowner4
  k8sCloudRegionId: k8sregionfour
  k8sCloudOwner: k8scloudowner4
  ecompInstanceId: OOM
  openStackRegion: k8sregionfour
  openStackVNFTenantId: aaaa

Note: In the NBI clode, there is an if statement for a variable public_net_id  which if null selects  RegionOne/CloudOwner, and k8sregionfour/k8scloudowner if not null.  Overwriting ClowdOwner adn openStackRegion to the k8s values ensures NBI will orchestrate on the k8s cloud.

To recap, update the values in the confg section of the NBI values..yaml.

• openStackRegion = the k8s region
• cloudOwner = value for k8s cloud owner
• openStackVNFTenantId = the same tenantid value for the k8s cloud.

SO Maria DB:

MariaDB [catalogdb]> select * from  orchestration_flow_reference;

| 429 | Service-Macro-Create | 1 | AssignServiceInstanceBB | 1 | 102 | NULL | NULL |
| 432 | Service-Macro-Create | 2 | CreateNetworkCollectionBB | 1 | 102 | NULL | NULL |
| 435 | Service-Macro-Create | 13 | AssignServiceInstanceBBAssignNetworkBB | 1 | 102 | NULL | NULL |
| 432438 | Service-Macro-Create | 24 | CreateNetworkCollectionBBAssignVnfBB | 1 | 102 | NULL | NULL |
| 435441 | Service-Macro-Create | 35 | AssignNetworkBBAssignVolumeGroupBB | 1 | 102 | NULL | NULL |
| 438444 | Service-Macro-Create | 46 | AssignVnfBBAssignVfModuleBB | 1 | 102 | NULL | NULL |
| 441447 | Service-Macro-Create | 57 | AssignVolumeGroupBBControllerExecutionBB | 1 | 102 | NULLvnf | NULLconfig-assign |
| 444450 | Service-Macro-Create | 68 | AssignVfModuleBBAssignPnfBB | 1 | 102 | NULL | NULL |
| 447453 | Service-Macro-Create | 79 | ControllerExecutionBBWaitForPnfReadyBB | 1 | 102 | vnfNULL | config-assignNULL |
| 450456 | Service-Macro-Create | 810 | AssignPnfBBActivatePnfBB | 1 | 102 | NULL | NULL |
| 453459 | Service-Macro-Create | 911 | WaitForPnfReadyBBCreateNetworkBB | 1 | 102 | NULL | NULL |
| 456462 | Service-Macro-Create | 1012 | ActivatePnfBBActivateNetworkBB | 1 | 102 | NULL | NULL |
| 459465 | Service-Macro-Create | 1115 | CreateNetworkBBCreateVolumeGroupBB | 1 | 102 | NULL | NULL |
| 462468 | Service-Macro-Create | 1216 | ActivateNetworkBBActivateVolumeGroupBB | 1 | 102 | NULL | NULL |
| 465471 | Service-Macro-Create | 1517 | CreateVolumeGroupBBCreateVfModuleBB | 1 | 102 | NULL | NULL |
| 468474 | Service-Macro-Create | 1618 | ActivateVolumeGroupBBActivateVfModuleBB | 1 | 102 | NULL | NULL |
| 471477 | Service-Macro-Create | 1719 | CreateVfModuleBBControllerExecutionBB | 1 | 102 | NULLvnf | NULLconfig-deploy |
| 474480 | Service-Macro-Create | 1820 | ActivateVfModuleBBActivateVnfBB | 1 | 102 | NULL | NULL |
| 477483 | Service-Macro-Create | 1921 | ControllerExecutionBBActivateNetworkCollectionBB | 1 | 102 | vnfNULL | config-deployNULL |
| 480486 | Service-Macro-Create | 2022 | ActivateVnfBBActivateServiceInstanceBB | 1 | 102 | NULL | NULL |
| 483 | Service-Macro-Create | 21 | ActivateNetworkCollectionBB | 1 | 102 | NULL | NULL |
| 486 | Service-Macro-Create | 22 | ActivateServiceInstanceBB | 1 | 102 | NULL | NULL |
 |

Check if cloud details are present in cloud_sites table. If does not exists then insert the same


insert into cloud_sites(ID, REGION_ID, IDENTITY_SERVICE_ID, CLOUD_VERSION, CLLI, ORCHESTRATOR) values("k8sregion", "k8sregion", "DEFAULT_KEYSTONE", "2.5", "clli2", "multicloud");

Instantiation of slice, day-0 configurations:

...