diff options
6 files changed, 36 insertions, 38 deletions
diff --git a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/config.txt b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/config.txt index d132aa2f3..3db686867 100644 --- a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/config.txt +++ b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/config.txt @@ -1,7 +1,7 @@ -AAI_URL=aai.api.simpledemo.openecomp.org:30233 +AAI_URL=aai:8443 AAI_USERNAME=AAI AAI_PASSWORD=AAI -SDNC_URL=sdnc.api.simpledemo.onap.org:30202 +SDNC_URL=sdnc:8282 SDNC_USERNAME=admin SDNC_PASSWORD=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U SVC_NOTIFICATION_URL=http://c1.vm1.mso.simpledemo.openecomp.org:8080
\ No newline at end of file diff --git a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_ChangeInternetProfileInstance.txt b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_ChangeInternetProfileInstance.txt index 9e71a5309..a093ec0cd 100644 --- a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_ChangeInternetProfileInstance.txt +++ b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_ChangeInternetProfileInstance.txt @@ -36,7 +36,7 @@ <network-request-input> <network-input-parameters> <param> - <name>vendor</name> + <name>manufacturer</name> <value>vendor_value</value> </param> <param> @@ -44,7 +44,7 @@ <value>service_id_value</value> </param> <param> - <name>remote_id</name> + <name>ip_remote_id</name> <value>remote_id_value</value> </param> <param> @@ -52,19 +52,19 @@ <value>ont_sn_value</value> </param> <param> - <name>service_type</name> + <name>ip_service_type</name> <value>service_type_value</value> </param> <param> - <name>mac</name> + <name>ip_rg_mac_addr</name> <value>mac_value</value> </param> <param> - <name>up_speed</name> + <name>ip_upstream_speed</name> <value>up_speed_value</value> </param> <param> - <name>down_speed</name> + <name>ip_downstream_speed</name> <value>down_speed_value</value> </param> <param> diff --git a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_CreateAccessConnectivityInstance.txt b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_CreateAccessConnectivityInstance.txt index b747c45ea..1ba3d07dd 100644 --- a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_CreateAccessConnectivityInstance.txt +++ b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_CreateAccessConnectivityInstance.txt @@ -36,7 +36,7 @@ <network-request-input> <network-input-parameters> <param> - <name>vendor</name> + <name>manufacturer</name> <value>vendor_value</value> </param> <param> @@ -52,7 +52,7 @@ <value>s_vlan_value</value> </param> <param> - <name>remoteID</name> + <name>remote_id</name> <value>remote_id_value</value> </param> </network-input-parameters> diff --git a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_DeleteAccessConnectivityInstance.txt b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_DeleteAccessConnectivityInstance.txt index a3fe0bd4d..5aa9edc68 100644 --- a/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_DeleteAccessConnectivityInstance.txt +++ b/examples/examples-onap-bbs/src/main/resources/examples/config/ONAPBBS/sdnc_DeleteAccessConnectivityInstance.txt @@ -36,12 +36,12 @@ <network-request-input> <network-input-parameters> <param> - <name>vendor</name> + <name>manufacturer</name> <value>vendor_value</value> </param> <param> <name>serviceID</name> - <value>serviceID_value</value> + <value>service_id_value</value> </param> </network-input-parameters> </network-request-input> diff --git a/examples/examples-onap-bbs/src/main/resources/logic/AAIServiceCreateTask.js b/examples/examples-onap-bbs/src/main/resources/logic/AAIServiceCreateTask.js index ac409ed2d..a1c11adae 100644 --- a/examples/examples-onap-bbs/src/main/resources/logic/AAIServiceCreateTask.js +++ b/examples/examples-onap-bbs/src/main/resources/logic/AAIServiceCreateTask.js @@ -100,8 +100,6 @@ try { var putUpddateServInstance = service_instance; putUpddateServInstance['orchestration-status'] = "created"; -if (putUpddateServInstance.hasOwnProperty('input-parameters')) - delete putUpddateServInstance['input-parameters']; executor.logger.info(" string" + JSON.stringify(putUpddateServInstance, null, 4)); var resource_version = putUpddateServInstance['resource-version']; diff --git a/examples/examples-onap-bbs/src/main/resources/logic/SdncResourceUpdateTask.js b/examples/examples-onap-bbs/src/main/resources/logic/SdncResourceUpdateTask.js index 85977097f..55f5a1ba1 100644 --- a/examples/examples-onap-bbs/src/main/resources/logic/SdncResourceUpdateTask.js +++ b/examples/examples-onap-bbs/src/main/resources/logic/SdncResourceUpdateTask.js @@ -112,27 +112,27 @@ xmlDeleteAccess = xmlDeleteAccess.replace("customer_name_value", input_param[ xmlDeleteAccess = xmlDeleteAccess.replace("srv_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlDeleteAccess = xmlDeleteAccess.replace("srv_info_model_custom_uuid_value", getResourceCustomizationUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlDeleteAccess = xmlDeleteAccess.replace("srv_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'OLT')); -xmlDeleteAccess = xmlDeleteAccess.replace("srv_info_model_name_value", "OLT"); + 'AccessConnectivity')); +xmlDeleteAccess = xmlDeleteAccess.replace("srv_info_model_name_value", "AccessConnectivity"); xmlDeleteAccess = xmlDeleteAccess.replace("network_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlDeleteAccess = xmlDeleteAccess.replace( "network_info_model_custom_uuid_value", getResourceCustomizationUuid( - input_param['service']['parameters']['resources'], 'OLT')); + input_param['service']['parameters']['resources'], 'AccessConnectivity')); xmlDeleteAccess = xmlDeleteAccess.replace("network_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'OLT')); + 'AccessConnectivity')); xmlDeleteAccess = xmlDeleteAccess.replace("network_info_model_name_value", - "OLT"); + "AccessConnectivity"); xmlDeleteAccess = xmlDeleteAccess.replace("vendor_value", input_param['service'] ['parameters']['requestInputs']['ont_ont_manufacturer']); @@ -188,27 +188,27 @@ xmlCreateAccess = xmlCreateAccess.replace("customer_name_value", input_param[ xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_custom_uuid_value", getResourceCustomizationUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'OLT')); -xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_name_value", "OLT"); + 'AccessConnectivity')); +xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_name_value", "AccessConnectivity"); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'OLT')); + ], 'AccessConnectivity')); xmlCreateAccess = xmlCreateAccess.replace( "network_info_model_custom_uuid_value", getResourceCustomizationUuid( - input_param['service']['parameters']['resources'], 'OLT')); + input_param['service']['parameters']['resources'], 'AccessConnectivity')); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'OLT')); + 'AccessConnectivity')); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_name_value", - "OLT"); + "AccessConnectivity"); xmlCreateAccess = xmlCreateAccess.replace("vendor_value", input_param['service'] ['parameters']['requestInputs']['ont_ont_manufacturer']); @@ -270,29 +270,29 @@ xmlChangeProfile = xmlChangeProfile.replace("customer_name_value", input_param[ xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'EdgeInternetProfile')); + ], 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_custom_uuid_value", getResourceCustomizationUuid(input_param['service']['parameters'][ 'resources' - ], 'EdgeInternetProfile')); + ], 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'EdgeInternetProfile')); + 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace("srv_info_model_name_value", - "EdgeInternetProfile"); + "InternetProfile"); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_inv_uuid_value", getResourceInvariantUuid(input_param['service']['parameters'][ 'resources' - ], 'EdgeInternetProfile')); + ], 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace( "network_info_model_custom_uuid_value", getResourceCustomizationUuid( input_param['service']['parameters']['resources'], - 'EdgeInternetProfile')); + 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_uuid_value", getResourceUuid(input_param['service']['parameters']['resources'], - 'EdgeInternetProfile')); + 'InternetProfile')); xmlCreateAccess = xmlCreateAccess.replace("network_info_model_name_value", - "EdgeInternetProfile"); + "InternetProfile"); xmlChangeProfile = xmlChangeProfile.replace("vendor_value", input_param[ 'service']['parameters']['requestInputs']['ont_ont_manufacturer']); |