From caa5768a32a385bf7997029929f29fe3b156348e Mon Sep 17 00:00:00 2001 From: Skip Wonnell Date: Sat, 23 Dec 2017 00:18:18 -0600 Subject: Platform Hardening for DG - Part 8 Issue-ID: APPC-305 Change-Id: I70fa76837b02314bdd3211190306cfbd3564d639 Signed-off-by: Skip Wonnell --- .../CheckConfigStatus_Failure.properties | 22 ++- .../CheckConfigStatus_Success.properties | 25 ++- .../APPC/CheckConfigStatus/MaxRetries.properties | 10 +- .../CheckConfigStatus/ParseErrorLogFail.properties | 10 +- .../ParseErrorLogSuccess.properties | 10 +- .../APPC_method_CommonConfiguration_TC2.properties | 12 +- .../GetConfigParamsFail.properties | 8 +- .../ISBCTemplateSuccess.properties | 12 +- .../InvalidRequestAction.properties | 8 +- .../ConfigBlockConfigure_Failure.properties | 23 +-- .../ConfigBlockConfigure_Success.properties | 25 ++- .../APPC/Configure/Configure_Failure.properties | 24 +-- .../APPC/Configure/Configure_Success.properties | 23 +-- .../Configure/GenerateConfig_Failure.properties | 22 +-- .../GenerateTemplateConfig_Failure.properties | 19 +-- .../APPC/Configure/GetTemplate_Failure.properties | 12 +- .../DownloadCliConfig_Adaptor_Failure.properties | 16 +- .../DownloadCliConfig_DB_Failure.properties | 16 +- .../DownloadCliConfig_Success.properties | 41 ++--- .../ConfigFile_Failure.properties | 8 +- .../DownloadIsbcConfig_Success.properties | 22 +-- .../APPC/DownloadIsbcConfig/Put_Failure.properties | 20 ++- .../GenerateConfigNoParams.properties | 8 +- .../GenerateConfigWithParams.properties | 11 +- .../GenerateTemplateConfigNoParams.properties | 8 +- .../GenerateTemplateConfigWithParams.properties | 8 +- .../APPC/GetAaiInfo/GetInfoSuccess.properties | 8 +- .../APPC/GetAaiInfo/GetVServerFail.properties | 8 +- .../APPC/GetAaiInfo/GetVnfFail.properties | 8 +- .../APPC/GetConfigParams/CliJson.properties | 14 +- .../APPC/GetConfigParams/CliString.properties | 16 +- .../GetConfigParams/CommonConfigFail.properties | 15 +- .../GetConfigParams/DefaultTemplate.properties | 14 +- .../GetConfigParams/Json2DGContextFail.properties | 12 +- .../APPC/GetConfigParams/Restore.properties | 20 +-- .../APPC/GetConfigParams/TemplateName.properties | 14 +- .../GetDeviceRunningConfig/Chef_Failure.properties | 12 +- .../GetDeviceRunningConfig/Chef_Others.properties | 12 +- .../GetDeviceRunningConfig/Chef_Success.properties | 12 +- .../GetDeviceRunningConfig/XML_Success.properties | 12 +- .../GetVfModuleInfo_Failure.properties | 8 +- .../GetVfModuleInfo_Success.properties | 8 +- .../GetInstarParamsFail.properties | 8 +- .../GetPDFail.properties | 8 +- .../MergeParamsFail.properties | 8 +- .../NoInstarParams.properties | 13 +- .../ProcessPD.properties | 14 +- .../SaveMdsalFail.properties | 14 +- .../PublishConfig_Failure.properties | 8 +- .../PublishConfig_Success.properties | 8 +- .../SaveRunningConfig_Failure.properties | 20 ++- .../SaveRunningConfig_Success.properties | 20 ++- .../UploadConfig_Failure.properties | 20 ++- .../APPC/SetStatus/SetStatus_AaiFailure.properties | 8 +- .../SetStatus_SaveRunningFailure.properties | 8 +- .../APPC/SetStatus/SetStatus_Success.properties | 8 +- .../APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties | 8 +- .../APPC/UpdateAaIInfo/Update_Fail.properties | 8 +- .../APPC/UpdateAaIInfo/Update_Success.properties | 8 +- .../APPC_method_CommonConfiguration_TC1.properties | 8 +- .../APPC_method_CommonConfiguration_TC2.properties | 12 +- ...d_configuration-document-request_TC1.properties | 8 +- .../resources/properties/tcfile/instar_values.json | 25 +-- .../properties/tcfile/isbc_config_parameters.json | 96 +++++------ .../properties/tcfile/payload_cli_config.json | 172 +++++++++---------- .../properties/tcfile/payload_json_config.json | 184 +++++++++------------ .../tcfile/payload_parameters_config.json | 166 ++++++++----------- .../properties/tcfile/payload_restore_config.json | 84 ++++------ .../properties/tcfile/payload_template_config.json | 87 ++++------ .../resources/properties/tcfile/request-param.json | 28 +--- .../resources/properties/tcfile/vdbe_data.json | 27 +-- .../resources/properties/tcfile/vdbe_template.xml | 54 +++--- 72 files changed, 883 insertions(+), 873 deletions(-) (limited to 'appc-directed-graph/appc-dgraph/provider/src/test/resources/properties') diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties index 46532299b..4fc913f5b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,20 +17,22 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=failure -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1 -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password= @@ -37,5 +41,5 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password= assertEquals.error-code=401 assertEquals.error-message=Configuration Failed. No configuration success or error file found on the device assertEquals.i=9 - + diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties index 48a2313b0..9398aec37 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/CheckConfigStatus_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,27 +17,24 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.configfilereference-success.TARGET-FILE-PATH=/tmp org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.outCome=success -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host=135.1.1.1 -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId=root -org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password=!bootstrap +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.host= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.loginId= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.password= org.onap.appc.ccadaptor.ConfigComponentAdaptor.get.params.assertEquals.fullPathFileName=/tmp - - - assertEquals.error-code=400 assertEquals.error-message=SUCCESS - request has been processed successfully assertEquals.i=1 - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties index 0d5ddc8db..23aa92996 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/MaxRetries.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.configfilereference-success.TARGET-FILE-PATH=SuccessFile input.configfilereference-failure.TARGET-FILE-PATH=FailureFile -input.vnf-host-ip-address=135.2.2.2 +input.vnf-host-ip-address= diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties index 300010200..a086e175e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.configfilereference-success.TARGET-FILE-PATH=SuccessFile input.configfilereference-failure.TARGET-FILE-PATH=FailureFile input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile -input.vnf-host-ip-address=135.1.1.1 +input.vnf-host-ip-address= input.fileContents=ERRORLOG org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=failure org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.params.assertEquals.logData=ERRORLOG diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties index ee2d47f11..e02578d00 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CheckConfigStatus/ParseErrorLogSuccess.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.configfilereference-success.TARGET-FILE-PATH=SuccessFile input.configfilereference-failure.TARGET-FILE-PATH=FailureFile input.configfilereference-log.TARGET-FILE-PATH=FailureLogFile -input.vnf-host-ip-address=135.1.1.1 +input.vnf-host-ip-address= input.fileContents=ERRORLOG org.onap.sdnc.config.generator.pattern.PatternNode.parseErrorLog.outCome=success diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties index e13c68845..24ed8a213 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/APPC_method_CommonConfiguration_TC2.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_json_config.json org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties index 12ea74d92..7c34b8196 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/GetConfigParamsFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties index a4a43f041..914a3d838 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/ISBCTemplateSuccess.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_parameters_config.json org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties index 4a9398b25..e7a3e9edf 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/CommonConfiguration/InvalidRequestAction.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties index f7866ca95..de51645ef 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type= -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -39,13 +43,12 @@ APPC.DownloadIsbcConfig.outCome=failure APPC.GenerateConfig.outCome=success -assertEquals.host-ip-address=135.1.1.1 -assertEquals.device-login=root - -assertEquals.device-password=!bootstrap +assertEquals.host-ip-address= +assertEquals.device-login= + +assertEquals.device-password= assertEquals.port-number=22 assertEquals.protocol=CLI assertEquals.device-config=DUMMYFILECONTENT assertEquals.tmp.message=Download Failure : 401 : ISBC Config Failed - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties index a6d9f747f..86270457f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/ConfigBlockConfigure_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,21 +17,21 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type= -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT input.tmp.configureactiondg.DOWNLOAD-CONFIG-DG=DownloadIsbcConfig - - # DG properties APPC.DownloadIsbcConfig.outCome=success APPC.GenerateConfig.outCome=success @@ -37,12 +39,9 @@ APPC.GenerateConfig.outCome=success APPC.ProcessParameterDefinition.outCome=success assertEquals.error-code=400 -assertEquals.host-ip-address=135.1.1.1 -assertEquals.device-login=root - -assertEquals.device-password=!bootstrap +assertEquals.host-ip-address= +assertEquals.device-login= +assertEquals.device-password= assertEquals.port-number=22 assertEquals.protocol=CLI assertEquals.device-config=DUMMYFILECONTENT - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties index a7c315e5c..0c19c9f6a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type=template -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -40,13 +44,11 @@ APPC.GenerateTemplateConfig.outCome=success #ProcessParameterDefinition APPC.ProcessParameterDefinition.outCome=success -assertEquals.host-ip-address=135.1.1.1 -assertEquals.device-login=root - -assertEquals.device-password=!bootstrap +assertEquals.host-ip-address= +assertEquals.device-login= + +assertEquals.device-password= assertEquals.port-number=22 assertEquals.protocol=CLI assertEquals.device-config=DUMMYFILECONTENT assertEquals.tmp.message=Download Failure : 401 : ISBC Config Failed - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties index 942c6e759..401b05eeb 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/Configure_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type=template -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -39,12 +43,9 @@ APPC.GenerateTemplateConfig.outCome=success APPC.ProcessParameterDefinition.outCome=success assertEquals.error-code=400 -assertEquals.host-ip-address=135.1.1.1 -assertEquals.device-login=root - -assertEquals.device-password=!bootstrap +assertEquals.host-ip-address= +assertEquals.device-login +assertEquals.device-password= assertEquals.port-number=22 assertEquals.protocol=CLI assertEquals.device-config=DUMMYFILECONTENT - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties index de7c0eb5d..ee865fab3 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateConfig_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,21 +17,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type= -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT - - - APPC.GenerateConfig.outCome=failure assertNull.host-ip-address @@ -38,8 +39,3 @@ assertNull.device-password assertNull.port-number assertNull.protocol assertNull.device-config - - - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties index e1c73635d..e219ba0aa 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GenerateTemplateConfig_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,14 +17,16 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.config-type=template -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -40,8 +44,3 @@ assertNull.device-password assertNull.port-number assertNull.protocol assertNull.device-config - - - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties index 88243026a..c82a42de1 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/Configure/GetTemplate_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -26,7 +30,3 @@ org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=failure org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.config-template.error-message=Unable to get template assertEquals.error-code=401 assertEquals.error-message=Unable to get template - - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties index 9e85c51a6..a9c786dbe 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Adaptor_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.device-config=tcfile:///cli_config_content.txt -input.host-ip-address=135.1.1.1 -input.device-login=root -input.device-password = !bootstrap +input.host-ip-address= +input.device-login= +input.device-password = input.port-number = 22 input.vnf-type = vUSP - Metaswitch vSBC @@ -36,5 +40,3 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.error-message = assertEquals.error-code=401 assertNotNull.error-message - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties index f99882843..f3bd5187e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_DB_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,13 +17,15 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### input.device-config=tcfile:///cli_config_content.txt -input.host-ip-address=135.1.1.1 -input.device-login=root -input.device-password = !bootstrap +input.host-ip-address= +input.device-login= +input.device-password = input.port-number = 22 input.vnf-type = vUSP - Metaswitch vSBC @@ -34,5 +38,3 @@ download-config-template.outCome=FAILURE assertEquals.error-code=401 assertNotNull.error-message - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties index fd682a90f..ada0196c9 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadCliConfig/DownloadCliConfig_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,14 +17,16 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### # To initialise DG Context before execution -# input.= XXXXX -input.host-ip-address=135.1.1.1 -input.device-login=root -input.device-password = !bootstrap +# input.= XXXXX +input.host-ip-address= +input.device-login= +input.device-password = input.port-number = 22 input.vnf-type = vUSP - Metaswitch vSBC # To populate the context variable from file content @@ -31,18 +35,18 @@ input.device-config=tcfile:///cli_config_content.txt # SQL Resource Node #---------------------------- # +# pfx='download-config-template'> -# To define the SQL execution Status .outCome= SUCCESS | FAILURE | NOT_FOUND +# To define the SQL execution Status .outCome= SUCCESS | FAILURE | NOT_FOUND download-config-template.outCome=SUCCESS -# To assert SQL execution node context param ..= XXXXX +# To assert SQL execution node context param ..= XXXXX download-config-template.assertEquals.vnf-type = vUSP - Metaswitch vSBC -# To Populate the SQL executionoutput .= XXXXX, In this case -# after executing SQL query, I expect the response should be stored in the DG context variable name download-config-template.TEMPLATE +# To Populate the SQL executionoutput .= XXXXX, In this case +# after executing SQL query, I expect the response should be stored in the DG context variable name download-config-template.TEMPLATE download-config-template.download-config-template.TEMPLATE=tcfile:///download_cli_config_template.txt # Configure Node @@ -56,14 +60,13 @@ download-config-template.download-config-template.TEMPLATE=tcfile:///download_cl # org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.outCome=success -# To assert execution/configure node context param ..params..= XXXXX +# To assert execution/configure node context param ..params..= XXXXX org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.params.assertEquals.Port_number=22 -# To assert execution/configure node context param ...= XXXXX +# To assert execution/configure node context param ...= XXXXX org.onap.appc.ccadaptor.ConfigComponentAdaptor.DownloadCliConfig.assertEquals.vnf-type = vUSP - Metaswitch vSBC -# To assert DG Context after execution -# .= XXXXX +# To assert DG Context after execution +# .= XXXXX assertNull.error-code assertNull.error-message - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties index bebcabd76..c15625119 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/ConfigFile_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties index 41c78827d..a4481ca19 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/DownloadIsbcConfig_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,22 +17,24 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.deviceconfig-file-content=DUMMYFILECONTENT input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=success -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1 -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password= org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp @@ -38,8 +42,6 @@ org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathF APPC.CheckConfigStatus.outCome=success - assertNull.error-code assertNull.error-message - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties index b512dd607..074564341 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/DownloadIsbcConfig/Put_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,21 +17,23 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### -input.vnf-host-ip-address=135.1.1.1 -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.vnf-host-ip-address= +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.deviceconfig-file-content=DUMMYFILECONTENT input.configfilereference-deviceconfig.TARGET-FILE-PATH=/tmp org.onap.appc.data.services.node.ConfigResourceNode.getConfigFileReference.outCome=success org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.outCome=failure -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host=135.1.1.1 -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId=root -org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password=!bootstrap +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.host= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.loginId= +org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.password= org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.data=DUMMYFILECONTENT org.onap.appc.ccadaptor.ConfigComponentAdaptor.put.params.assertEquals.fullPathFileName=/tmp diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties index 071330213..4aeac16a5 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigNoParams.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties index 42861fe49..cc5ad5cb1 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateConfig/GenerateConfigWithParams.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -25,6 +29,3 @@ assertEquals.file-category=device_configuration assertEquals.file-category1=configuration_block assertEquals.file-category2=config_data assertNotNull.tmp.merge.mergedData - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties index bb9961997..43cd9d029 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigNoParams.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties index f1525f932..079db234e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GenerateTemplateConfig/GenerateTemplateConfigWithParams.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties index 4ad130021..eeb21b820 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetInfoSuccess.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties index f2ae11299..859ff4f6d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVServerFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties index 48d5d0aa1..5958c9476 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetAaiInfo/GetVnfFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties index 24d6e11ac..aa1752fb0 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliJson.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -29,8 +33,8 @@ input.input.payload=tcfile://payload_json_config.json org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 @@ -42,7 +46,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi APPC.GetAaiInfo.outCome=success assertNull.config-type -assertEquals.device-authentication.USER-NAME=root +assertEquals.device-authentication.USER-NAME= assertEquals.template-name= assertNotNull.configuration assertNotNull.configuration-params diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties index f10ec5041..cc34b65c0 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CliString.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -32,8 +36,8 @@ APPC.GetAaiInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 @@ -44,9 +48,7 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi assertNull.config-type -assertEquals.device-authentication.USER-NAME=root +assertEquals.device-authentication.USER-NAME= assertEquals.template-name= assertNotNull.configuration assertNotNull.configuration-params - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties index db34ea296..4422539a1 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/CommonConfigFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -38,10 +42,3 @@ assertEquals.template-name= assertEquals.configuration-params= assertEquals.error-code=401 assertEquals.error-message=getCommonConfigInfoFailure - - - - - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties index cf443cd03..7ab5a959e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/DefaultTemplate.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -31,8 +35,8 @@ APPC.GetAaiInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 @@ -42,5 +46,5 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig assertEquals.config-type=template -assertEquals.device-authentication.USER-NAME=root +assertEquals.device-authentication.USER-NAME= assertNotNull.configuration-params diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties index b6dea196b..55f10210d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Json2DGContextFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -32,7 +36,3 @@ org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.outCome org.onap.sdnc.config.generator.convert.ConvertNode.convertJson2DGContext.tmp.convertnode.error-message=Conversion to DG Context Failed assertEquals.error-code=401 assertEquals.error-message=Conversion to DG Context Failed - - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties index 957369e2b..c26de252b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/Restore.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -26,14 +30,12 @@ input.input.api-ver=2.11 input.input.action=Configure input.input.payload=tcfile://payload_restore_config.json - - APPC.GetAaiInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 @@ -42,12 +44,8 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.MODULE = appc org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig - assertEquals.config-type=template -assertEquals.device-authentication.USER-NAME=root +assertEquals.device-authentication.USER-NAME= assertEquals.template-name= assertNull.configuration assertEquals.configuration-params= - - - diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties index 16353d0a0..10a6e736d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetConfigParams/TemplateName.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -31,8 +35,8 @@ APPC.GetAaiInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 @@ -42,5 +46,5 @@ org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.devi org.onap.appc.data.services.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DG-RPC = getDeviceRunningConfig assertEquals.config-type=template -assertEquals.device-authentication.USER-NAME=root +assertEquals.device-authentication.USER-NAME= assertEquals.template-name=vISBC-ssc-change_template1 diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties index a280c2a11..084f5d41f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -24,8 +28,8 @@ input.config.vnf-type= input.config.vnf-name= input.config.protocol=CHEF input.config.host-ip-address=localhost -input.config.user-name=brinda -input.config.password=brinda123 +input.config.user-name= +input.config.password= input.config.port-number=80 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=failure diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties index baa96ecc5..382eae432 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Others.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -24,8 +28,8 @@ input.config.vnf-type= input.config.vnf-name= input.config.protocol=CHEF input.config.host-ip-address=localhost -input.config.user-name=brinda -input.config.password=brinda123 +input.config.user-name= +input.config.password= input.config.port-number=80 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=Other diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties index e3336e666..0146fc0d7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/Chef_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -24,8 +28,8 @@ input.config.vnf-type= input.config.vnf-name= input.config.protocol=CHEF input.config.host-ip-address=localhost -input.config.user-name=brinda -input.config.password=brinda123 +input.config.user-name= +input.config.password= input.config.port-number=80 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties index e3336e666..0146fc0d7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetDeviceRunningConfig/XML_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -24,8 +28,8 @@ input.config.vnf-type= input.config.vnf-name= input.config.protocol=CHEF input.config.host-ip-address=localhost -input.config.user-name=brinda -input.config.password=brinda123 +input.config.user-name= +input.config.password= input.config.port-number=80 org.onap.appc.data.services.node.ConfigResourceNode.getConfigFilesByVnfVmNCategory.outCome=success diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties index e8538078d..da13b3460 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties index 34964c575..2eccdf06a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/GetVfModuleInfo/GetVfModuleInfo_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties index 593a88c68..098fa30ec 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetInstarParamsFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties index 4739c8796..ca50870ab 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/GetPDFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties index 7428353ce..3926b35f9 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/MergeParamsFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties index 9eae0a0e8..41b1de872 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/NoInstarParams.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -22,7 +26,4 @@ input.configuration-params=tcfile://request-param.json org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.outCome=success org.onap.appc.data.services.node.ConfigResourceNode.getTemplate.parameter-definitions.file-content=tcfile://noinstarparams_pd.yaml - - -assertEquals.configuration-params={ "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", "LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"} - +assertEquals.configuration-params={ "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", "LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"} diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties index 0983c5b94..3581c622e 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/ProcessPD.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -29,15 +33,15 @@ org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json -#To assert execution/configure node context param ..params..= XXXXX +#To assert execution/configure node context param ..params..= XXXXX org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=success org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid -org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} +org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true -assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} +assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} assertEquals.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"] diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties index fd7140540..cbc9296f8 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/ProcessParameterDefinition/SaveMdsalFail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -29,17 +33,17 @@ org.onap.appc.instar.node.InstarClientNode.getInstarInfo.outCome=success org.onap.appc.instar.node.InstarClientNode.getInstarInfo.tmp.instarValues.INSTAR-KEY-VALUES=tcfile://instar_values.json -#To assert execution/configure node context param ..params..= XXXXX +#To assert execution/configure node context param ..params..= XXXXX org.onap.appc.dg.common.VNFConfigurator.storeConfig.outCome=failure org.onap.appc.dg.common.VNFConfigurator.storeConfig.tmp.mdSalSave.ERROR_MESSAGE=MDSAL ERROR org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.uniqueId=1234 org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.requestId=requestid -org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} +org.onap.appc.dg.common.VNFConfigurator.storeConfig.params.assertEquals.configJSON={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} org.onap.appc.data.services.node.ConfigResourceNode.saveConfigTransactionLog.outCome=true org.onap.appc.dg.common.DCAEReporterPlugin.report.outCome=true -assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"fd00:f4d5:ea06:1:0:110:136:254","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} +assertEquals.configuration-params={"LOCAL_BILLING_IP_ADDR":"192.168.30.1","LOCAL_ACCESS_IP_ADDR":"192.168.30.1","CORE_NETWORK_PLEN":"32","LOCAL_CORE_ALT_IP_ADDR":"DummyInstarIP1","REMOTE_CORE_ALT_IP_ADDR":"0:0:0:0:192:168:30:1","REMOTE_ACCESS_IP_ADDR":"DummyInstarIP2","REMOTE_BILLING_IP_ADDR":"192.168.30.1"} assertEquals.INSTAR.keys=["LOCAL_CORE_ALT_IP_ADDR","REMOTE_ACCESS_IP_ADDR"] assertEquals.dcae-error-message=MDSAL ERROR diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties index da4160121..93516e580 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties index b094a6791..0168b477f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/PublishConfiguration/PublishConfig_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties index 324b3d234..6979b464d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001 input.vm-name=ibcx0001vm001 input.vnf-type=ISBC -input.vnf-host-ip-address=135.1.1.1 +input.vnf-host-ip-address= -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -46,10 +50,10 @@ assertEquals.config.vm-name=ibcx0001vm001 assertEquals.config.vnf-type=ISBC -assertEquals.config.host-ip-address=135.1.1.1 +assertEquals.config.host-ip-address= -assertEquals.config.user-name=root -assertEquals.config.password = !bootstrap +assertEquals.config.user-name= +assertEquals.config.password = assertEquals.config.port-number = 22 assertEquals.config.protocol = CLI diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties index f20421be0..4d6b0aa8f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/SaveRunningConfig_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001 input.vm-name=ibcx0001vm001 input.vnf-type=ISBC -input.vnf-host-ip-address=135.1.1.1 +input.vnf-host-ip-address= -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -50,10 +54,10 @@ assertEquals.config.vm-name=ibcx0001vm001 assertEquals.config.vnf-type=ISBC -assertEquals.config.host-ip-address=135.1.1.1 +assertEquals.config.host-ip-address= -assertEquals.config.user-name=root -assertEquals.config.password = !bootstrap +assertEquals.config.user-name= +assertEquals.config.password = assertEquals.config.port-number = 22 assertEquals.config.protocol = CLI diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties index 3488888a2..952b321fb 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SaveRunningConfig/UploadConfig_Failure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -23,10 +27,10 @@ input.vm-name=ibcx0001vm001 input.vm-name=ibcx0001vm001 input.vnf-type=ISBC -input.vnf-host-ip-address=135.1.1.1 +input.vnf-host-ip-address= -input.device-authentication.USER-NAME=root -input.device-authentication.PASSWORD = !bootstrap +input.device-authentication.USER-NAME= +input.device-authentication.PASSWORD = input.device-authentication.PORT-NUMBER = 22 input.tmp.deviceinterfaceprotocol.PROTOCOL = CLI input.deviceconfig-file-content=DUMMYFILECONTENT @@ -48,10 +52,10 @@ assertEquals.config.vm-name=ibcx0001vm001 assertEquals.config.vnf-type=ISBC -assertEquals.config.host-ip-address=135.1.1.1 +assertEquals.config.host-ip-address= -assertEquals.config.user-name=root -assertEquals.config.password = !bootstrap +assertEquals.config.user-name= +assertEquals.config.password = assertEquals.config.port-number = 22 assertEquals.config.protocol = CLI diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties index 9e41c78d9..80f6eec5d 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_AaiFailure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties index dcb6b813b..2ad66d06b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_SaveRunningFailure.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties index 2018e5a37..86543eeb8 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/SetStatus/SetStatus_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties index 83b82aa05..541244835 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/GetVnfcRef_Fail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties index 55c6243cd..dc47df5e0 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Fail.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties index f84571f7d..18cf9dc36 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC/UpdateAaIInfo/Update_Success.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties index fba26b34a..037e4ca15 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC1.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties index b65597f50..6e6659c29 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/APPC_method_CommonConfiguration_TC2.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### @@ -31,8 +35,8 @@ input.input.payload=tcfile://payload_json_config.json com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.commonConfigInfo.status=success com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.DEVICE-AUTHENTICATION-ID = 3 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.VNF-TYPE=vUSP - Metaswitch vSBC -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME=root -com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = !bootstrap +com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.USER-NAME= +com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PASSWORD = com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.device-authentication.PORT-NUMBER = 22 com.att.appc.config.generator.node.ConfigResourceNode.getCommonConfigInfo.tmp.deviceinterfaceprotocol.DEVICE-INTERFACE-PROTOCOL-ID = 4 diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties index 225e304b5..1b434fd29 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/ASDC-MESSAGE_method_configuration-document-request_TC1.properties @@ -1,9 +1,11 @@ ### # ============LICENSE_START======================================================= -# ONAP : APP-C +# ONAP : APPC # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -15,6 +17,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. # ============LICENSE_END========================================================= ### diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json index 6d053cf7d..b5341f20b 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/instar_values.json @@ -1,25 +1,4 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "LOCAL_CORE_ALT_IP_ADDR": "DummyInstarIP1", - "REMOTE_ACCESS_IP_ADDR": "DummyInstarIP2" - + "LOCAL_CORE_ALT_IP_ADDR": "DummyInstarIP1", + "REMOTE_ACCESS_IP_ADDR": "DummyInstarIP2" } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json index 217f9d67c..fda4ef690 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/isbc_config_parameters.json @@ -1,60 +1,40 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "pair-number": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "pair-number": "ibcx0001vm002ssc001pair" - } - ] - } - ] - }, - "configuration-parameters": { - "node0_hostname" : "appc-host", - "node0_backup_router_address": "2001:1890:1253::192:168:100:1", - "node0_tacplus_server_name1": "servername1", - "node0_tacplus_server_name2": "servername2" - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "192.168.16.3", + "service-instance-id": "ibcx0001vm001", + "site-location": "SomePlace", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "192.168.1.1", + "pair-number": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "pair-number": "ibcx0001vm002ssc001pair" + } + ] + } + ] + }, + "configuration-parameters": { + "node0_hostname": "appc-host", + "node0_backup_router_address": "0:0:0::192:168:100:1", + "node0_tacplus_server_name1": "servername1", + "node0_tacplus_server_name2": "servername2" + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json index 8d872e173..9bd143c48 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_cli_config.json @@ -1,98 +1,78 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "group-notation": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "group-notation": "ibcx0001vm002ssc001pair" - } - ] - } - ] - }, - "configuration": { - "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n" - }, - "configuration-parameters": { - "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "LOCAL_BILLING_IP_ADDR": "192.168.30.1", - "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "REMOTE_BILLING_IP_ADDR": "192.168.30.1", - "CORE_NETWORK_PLEN": "32", - "CORE_NETWORK_ALT_PLEN": "126", - "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "ACCESS_NETWORK_PLEN": "32", - "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", - "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", - "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "135.21.166.39", + "service-instance-id": "ibcx0001vm001", + "site-location": "Middletown", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "12.1.1.1", + "group-notation": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "group-notation": "ibcx0001vm002ssc001pair" + } + ] + } + ] + }, + "configuration": { + "configuration-string": "config\r\nsystem\r\nservice-interface serv1\r\nipv4\r\ngateway-ip-address 12.12.12.12\r\n" + }, + "configuration-parameters": { + "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", + "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_BILLING_IP_ADDR": "192.168.30.1", + "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", + "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_BILLING_IP_ADDR": "192.168.30.1", + "CORE_NETWORK_PLEN": "32", + "CORE_NETWORK_ALT_PLEN": "126", + "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_PLEN": "32", + "ACCESS_NETWORK_ALT_PLEN": "126", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "BILLING_NETWORK_PLEN": "32", + "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", + "VIRT_CORE_IP_ADDR": "135.25.69.147", + "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "VIRT_ACCESS_IP_ADDR": "135.25.69.147", + "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "VIRT_BILLING_IP_ADDR": "135.25.69.147", + "DNS_SERVERS": "135.25.69.147", + "SNMP_CLIENT_1": "135.25.69.147", + "SNMP_CLIENT_2": "135.25.69.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", + "BILLING_SERVER_1": "135.25.69.147", + "BILLING_SERVER_2": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", + "OAM_VIP_HOSTNAME": "135.25.69.147", + "DG_APP_SERVER1": "135.25.69.147", + "DG_APP_SERVER2": "135.25.69.147", + "CTS_IP_RANGE": "135.25.69.147", + "CTS_PREFIX_LENGTH": "26", + "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json index e29080aab..d6b2ebbe7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_json_config.json @@ -1,104 +1,84 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "group-notation": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "group-notation": "ibcx0001vm002ssc001pair" - } - ] - } - ] - }, - "configuration": { - "configuration-json": { - "config": { - "group": { - "interface": "interface1" - } - } - } - }, - "configuration-parameters": { - "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "LOCAL_BILLING_IP_ADDR": "192.168.30.1", - "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "REMOTE_BILLING_IP_ADDR": "192.168.30.1", - "CORE_NETWORK_PLEN": "32", - "CORE_NETWORK_ALT_PLEN": "126", - "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "ACCESS_NETWORK_PLEN": "32", - "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", - "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", - "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "135.21.166.39", + "service-instance-id": "ibcx0001vm001", + "site-location": "Middletown", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "12.1.1.1", + "group-notation": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "group-notation": "ibcx0001vm002ssc001pair" + } + ] + } + ] + }, + "configuration": { + "configuration-json": { + "config": { + "group": { + "interface": "interface1" + } + } + } + }, + "configuration-parameters": { + "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", + "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "LOCAL_BILLING_IP_ADDR": "192.168.30.1", + "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", + "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "REMOTE_BILLING_IP_ADDR": "192.168.30.1", + "CORE_NETWORK_PLEN": "32", + "CORE_NETWORK_ALT_PLEN": "126", + "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "ACCESS_NETWORK_PLEN": "32", + "ACCESS_NETWORK_ALT_PLEN": "126", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", + "BILLING_NETWORK_PLEN": "32", + "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", + "VIRT_CORE_IP_ADDR": "135.25.69.147", + "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "VIRT_ACCESS_IP_ADDR": "135.25.69.147", + "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", + "VIRT_BILLING_IP_ADDR": "135.25.69.147", + "DNS_SERVERS": "135.25.69.147", + "SNMP_CLIENT_1": "135.25.69.147", + "SNMP_CLIENT_2": "135.25.69.147", + "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", + "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", + "BILLING_SERVER_1": "135.25.69.147", + "BILLING_SERVER_2": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", + "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", + "OAM_VIP_HOSTNAME": "135.25.69.147", + "DG_APP_SERVER1": "135.25.69.147", + "DG_APP_SERVER2": "135.25.69.147", + "CTS_IP_RANGE": "135.25.69.147", + "CTS_PREFIX_LENGTH": "26", + "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", + "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json index 968db23e3..fc39a4f24 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_parameters_config.json @@ -1,95 +1,75 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "pair-number": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "pair-number": "ibcx0001vm002ssc001pair" - } - ] - } - ] - }, - "configuration-parameters": { - "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", - "LOCAL_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "LOCAL_BILLING_IP_ADDR": "192.168.30.1", - "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", - "REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "REMOTE_BILLING_IP_ADDR": "192.168.30.1", - "CORE_NETWORK_PLEN": "32", - "CORE_NETWORK_ALT_PLEN": "126", - "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", - "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "ACCESS_NETWORK_PLEN": "32", - "ACCESS_NETWORK_ALT_PLEN": "126", - "ACCESS_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "fd00:f4d5:ea06:1:0:110:136:254", - "BILLING_NETWORK_PLEN": "32", - "BILLING_NETWORK_DEFAULT_GATEWAY": "135.25.69.147", - "VIRT_CORE_IP_ADDR": "135.25.69.147", - "VIRT_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_ACCESS_IP_ADDR": "135.25.69.147", - "VIRT_ACCESS_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254", - "VIRT_BILLING_IP_ADDR": "135.25.69.147", - "DNS_SERVERS": "135.25.69.147", - "SNMP_CLIENT_1": "135.25.69.147", - "SNMP_CLIENT_2": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT1": "135.25.69.147", - "SNMP_COMMUNITY_STRING_CLIENT2": "135.25.69.147", - "BILLING_SERVER_1": "135.25.69.147", - "BILLING_SERVER_2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR1": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR2": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR3": "135.25.69.147", - "IMS_CORE_ALT_IP_ADDR4": "135.25.69.147", - "OAM_VIP_HOSTNAME": "135.25.69.147", - "DG_APP_SERVER1": "135.25.69.147", - "DG_APP_SERVER2": "135.25.69.147", - "CTS_IP_RANGE": "135.25.69.147", - "CTS_PREFIX_LENGTH": "26", - "LICENSE_KEY": "AQGpAQA/AQAEAAANBAIAGY1mwTCGq0adcFTpiuwgDxAFwlmxPP8TYmQDAAEBBAAABQAEVwMAAAYABFhR3QAHAARXAwAAAgFkAQAoAQABBAIAB0MwMjc1MTgDAAL//wYAB0wwMTEwMDEHAAQAAAABCQABAAIBNgEBMwEAAQECAAEAAwAEAAGGoAQABP////8FAASAADTfBgAE/////wcAFAEABkcuNzI5QQIABAAAE4gDAAEBBwARAQADQU1SAgAEAAATiAMAAQEHABQBAAZBTVItV0ICAAQAABOIAwABAQsABAABhqAMAB4BABBJTlNUX0lTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX0lTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX1NTQ19IQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19TQV9WSVJUAgAEAAAAZAMAAQEMAB4BABBJTlNUX01TQ19IQV9WSVJUAgAEAAAAZAMAAQG8N/Kba2f53+Rj7bN0En1MmpFrvPo+QBSk0smG9XCVZ8lmwYTCggTSLdHDG8kR1/AsSz7nr3v87H+4GIuY+Ktjw7Ug1a8xhBRUabSjz5pOm34ZZwG8uC38sbgVfIXEZJd+jukvAijyRqnrud5MX24vozW/tVMYj4GHCmrdc176tA==", - "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "192.168.16.3", + "service-instance-id": "ibcx0001vm001", + "site-location": "SomePlace", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "192.168.1.1", + "pair-number": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "pair-number": "ibcx0001vm002ssc001pair" + } + ] + } + ] + }, + "configuration-parameters": { + "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", + "LOCAL_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1", + "LOCAL_BILLING_IP_ADDR": "192.168.30.1", + "REMOTE_ACCESS_IP_ADDR": "192.168.30.1", + "REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1", + "REMOTE_BILLING_IP_ADDR": "192.168.30.1", + "CORE_NETWORK_PLEN": "32", + "CORE_NETWORK_ALT_PLEN": "126", + "CORE_NETWORK_DEFAULT_GATEWAY": "192.168.30.1", + "CORE_NETWORK_ALT_DEFAULT_GATEWAY": "0:0:0:0:192:168:30:1", + "ACCESS_NETWORK_PLEN": "32", + "ACCESS_NETWORK_ALT_PLEN": "126", + "ACCESS_NETWORK_DEFAULT_GATEWAY": "192.168.6.14", + "ACCESS_NETWORK_ALT_DEFAULT_GATEWAY": "0:0:0:0:192:168:30:1", + "BILLING_NETWORK_PLEN": "32", + "BILLING_NETWORK_DEFAULT_GATEWAY": "192.168.6.14", + "VIRT_CORE_IP_ADDR": "192.168.6.14", + "VIRT_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1", + "VIRT_ACCESS_IP_ADDR": "192.168.6.14", + "VIRT_ACCESS_ALT_IP_ADDR": "0:0:0:0:192:168:30:1", + "VIRT_BILLING_IP_ADDR": "192.168.6.14", + "DNS_SERVERS": "192.168.6.14", + "SNMP_CLIENT_1": "192.168.6.14", + "SNMP_CLIENT_2": "192.168.6.14", + "SNMP_COMMUNITY_STRING_CLIENT1": "192.168.6.14", + "SNMP_COMMUNITY_STRING_CLIENT2": "192.168.6.14", + "BILLING_SERVER_1": "192.168.6.14", + "BILLING_SERVER_2": "192.168.6.14", + "IMS_CORE_ALT_IP_ADDR1": "192.168.6.14", + "IMS_CORE_ALT_IP_ADDR2": "192.168.6.14", + "IMS_CORE_ALT_IP_ADDR3": "192.168.6.14", + "IMS_CORE_ALT_IP_ADDR4": "192.168.6.14", + "OAM_VIP_HOSTNAME": "192.168.6.14", + "DG_APP_SERVER1": "192.168.6.14", + "DG_APP_SERVER2": "192.168.6.14", + "CTS_IP_RANGE": "192.168.6.14", + "CTS_PREFIX_LENGTH": "26", + "LICENSE_KEY": "Abcdefghijklmnop123456789", + "LIC_SERVER_BYPASS_URI": "file:///var/opt/MetaSwitch/craft/ftp/META-L011001-20170316.byp" + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json index 4f282963b..1d37cb476 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_restore_config.json @@ -1,54 +1,34 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "pair-number": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "pair-number": "ibcx0001vm002ssc001pair" - } - ] - } - ] - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "192.168.16.3", + "service-instance-id": "ibcx0001vm001", + "site-location": "SomePlace", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "192.168.1.1", + "pair-number": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "pair-number": "ibcx0001vm002ssc001pair" + } + ] + } + ] + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json index edd5be344..0ffd3000f 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/payload_template_config.json @@ -1,56 +1,35 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "request-parameters": { - "vnf-type": "ISBC", - "vnf-host-ip-address": "135.21.166.39", - "service-instance-id": "ibcx0001vm001", - "site-location": "Middletown", - "vnf-name": "ibcx0001v", - "vm": [ - { - "vm-name": "ibcx0001vm001", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm001ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "ipaddress-v4-oam-vip": "12.1.1.1", - "group-notation": "ibcx0001vm001ssc001pair" - } - ] - }, - { - "vm-name": "ibcx0001vm002", - "vnfc": [ - { - "vnfc-name": "ibcx0001vm002ssc001", - "vnfc-function-code": "ssc", - "vnfc-type": "vISBC – ssc", - "group-notation": "ibcx0001vm002ssc001pair" - } - ] - } - ], - "template-name": "vISBC-ssc-change_template1" - - } + "request-parameters": { + "vnf-type": "ISBC", + "vnf-host-ip-address": "192.168.16.3", + "service-instance-id": "ibcx0001vm001", + "site-location": "SomePlace", + "vnf-name": "ibcx0001v", + "vm": [ + { + "vm-name": "ibcx0001vm001", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm001ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "ipaddress-v4-oam-vip": "192.168.1.1", + "group-notation": "ibcx0001vm001ssc001pair" + } + ] + }, + { + "vm-name": "ibcx0001vm002", + "vnfc": [ + { + "vnfc-name": "ibcx0001vm002ssc001", + "vnfc-function-code": "ssc", + "vnfc-type": "vISBC – ssc", + "group-notation": "ibcx0001vm002ssc001pair" + } + ] + } + ], + "template-name": "vISBC-ssc-change_template1" + } } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json index 68f9c9fe4..9db06586a 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/request-param.json @@ -1,21 +1,7 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -{ "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", "LOCAL_BILLING_IP_ADDR": "192.168.30.1","REMOTE_CORE_ALT_IP_ADDR": "fd00:f4d5:ea06:1:0:110:136:254","REMOTE_BILLING_IP_ADDR": "192.168.30.1","CORE_NETWORK_PLEN": "32"} +{ + "LOCAL_ACCESS_IP_ADDR": "192.168.30.1", + "LOCAL_BILLING_IP_ADDR": "192.168.30.1", + "REMOTE_CORE_ALT_IP_ADDR": "0:0:0:0:192:168:30:1", + "REMOTE_BILLING_IP_ADDR": "192.168.30.1", + "CORE_NETWORK_PLEN": "32" +} diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json index c1e17a17a..b12a9c5f7 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_data.json @@ -1,27 +1,6 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP : APP-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - { - "node0_hostname" : "appc-host", - "node0_backup_router_address": "2001:1890:1253::192:168:100:1", - "node0_tacplus_server_name1": "servername1", + "node0_hostname": "appc-host", + "node0_backup_router_address": "0:0:0:0:192:168:100:1", + "node0_tacplus_server_name1": "servername1", "node0_tacplus_server_name2": "servername2" - } diff --git a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml index 8d8c89cb8..9729f7121 100644 --- a/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml +++ b/appc-directed-graph/appc-dgraph/provider/src/test/resources/properties/tcfile/vdbe_template.xml @@ -1,9 +1,11 @@ - 15.1X49-D50.3 - - node0 - - $node0_hostname - -
$node0_backup_router_address
- 0.0.0.0/0 - - - $node0_tacplus_server_name1 - $node0_tacplus_server_source_address1 - - - - $node0_tacplus_server_name2 - $node0_tacplus_server_source_address1 - - - - - + xmlns:a="http://xml.juniper.net/junos/15.1X49/junos"> + 15.1X49-D50.3 + + node0 + + $node0_hostname + +
$node0_backup_router_address
+ 0.0.0.0/0 + + + $node0_tacplus_server_name1 + $node0_tacplus_server_source_address1 + + + + $node0_tacplus_server_name2 + $node0_tacplus_server_source_address1 + + + + + -- cgit 1.2.3-korg