diff options
Diffstat (limited to 'asdctool/src/main/resources/config')
| -rw-r--r-- | asdctool/src/main/resources/config/configuration.yaml | 10 | ||||
| -rw-r--r-- | asdctool/src/main/resources/config/error-configuration.yaml | 23 |
2 files changed, 25 insertions, 8 deletions
diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 48529a7c78..c92827e558 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -31,15 +31,12 @@ appVersion: 1.1.0 artifactGeneratorConfig: Artifact-Generator.properties resourcesForUpgrade: 5.0: - - org.openecomp.resource.cp.extCP - - tosca.nodes.network.Network - - tosca.nodes.network.Port - - org.openecomp.resource.cp.nodes.network.SubInterface + - tosca.nodes.Root skipUpgradeFailedVfs: true skipUpgradeVSPs: true autoHealingOwner: jh0003 -titanCfgFile: C:\Users\im453s\git\sdc\asdctool\src\main\resources\config\titan.properties +titanCfgFile: src\main\resources\config\titan.properties titanMigrationKeySpaceCfgFile: src\main\resources\config\titan-migration.properties titanInMemoryGraph: false titanLockTimeout: 1800 @@ -206,7 +203,6 @@ toscaArtifacts: type: TOSCA_CSAR description: TOSCA definition package of the asset - #Informational artifacts placeHolder excludeResourceCategory: - Generic @@ -333,7 +329,7 @@ serviceDeploymentArtifacts: - xml AAI_VF_INSTANCE_MODEL: acceptedTypes: - - xml + - xml OTHER: acceptedTypes: diff --git a/asdctool/src/main/resources/config/error-configuration.yaml b/asdctool/src/main/resources/config/error-configuration.yaml index d33876a7df..6a4aece245 100644 --- a/asdctool/src/main/resources/config/error-configuration.yaml +++ b/asdctool/src/main/resources/config/error-configuration.yaml @@ -100,6 +100,12 @@ errors: message: "Error: Invalid USER_ID '%1'.", messageId: "SVC4008" } +#---------SVC ------------------------------ + INVALID_SERVICE_STATE: { + code: 409, + message: "Error: Invalid service state. Expected state: %1, actual state: %2", + messageId: "" + } #---------SVC4049------------------------------ # %1 - service/resource COMPONENT_MISSING_CONTACT: { @@ -593,7 +599,7 @@ errors: } #---------SVC4301------------------------------ RESTRICTED_OPERATION: { - code: 409, + code: 403, message: "Error: Restricted operation.", messageId: "SVC4301" } @@ -1669,3 +1675,18 @@ errors: messageId: "SVC4647" } + +#---------SVC4673------------------------------ + INVALID_SERVICE_STATE: { + code: 409, + message: "Error: Invalid service state. Expected state: %1, actual state: %2", + messageId: "SVC4673" + } + +#---------SVC4674------------------------------ + INVALID_RESPONSE_FROM_PROXY: { + code: 502, + message: "Error: The server was acting as a gateway or proxy and received an invalid response from the upstream server", + messageId: "SVC4674" + } + |