From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../main/resources/config/DME2preferredRouter.txt | 0 .../src/main/resources/config/configuration.yaml | 72 ++++++++- .../config/distribution-engine-configuration.yaml | 39 ++++- .../main/resources/config/error-configuration.yaml | 162 ++++++++++++++++++++- catalog-be/src/main/resources/config/logback.xml | 10 +- 5 files changed, 270 insertions(+), 13 deletions(-) create mode 100644 catalog-be/src/main/resources/config/DME2preferredRouter.txt (limited to 'catalog-be/src/main/resources/config') diff --git a/catalog-be/src/main/resources/config/DME2preferredRouter.txt b/catalog-be/src/main/resources/config/DME2preferredRouter.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index 190153cb0a..aefdacea98 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -23,7 +23,7 @@ beSslPort: 8443 version: 1.1.0 released: 2012-11-30 -toscaConformanceLevel: 5.0 +toscaConformanceLevel: 7.0 minToscaConformanceLevel: 3.0 titanCfgFile: /home/vagrant/catalog-be/config/catalog-be/titan.properties @@ -146,6 +146,7 @@ resourceTypes: &allResourceTypes - CP - VL - VF + - CR - VFCMT - Abstract - CVFC @@ -198,7 +199,8 @@ toscaArtifacts: excludeResourceCategory: - Generic excludeResourceType: - - PNF + - PNF + - CR informationalResourceArtifacts: features: displayName: Features @@ -422,7 +424,7 @@ resourceDeploymentArtifacts: DCAE_DOC: acceptedTypes: validForResourceTypes: - - VF + - VF - VFCMT DCAE_EVENT: acceptedTypes: @@ -532,6 +534,7 @@ resourceInformationalArtifacts: - CP - VL - VF + - CR - VFCMT - Abstract - PNF @@ -641,6 +644,7 @@ genericAssetNodeTypes: VFC: org.openecomp.resource.abstract.nodes.VFC CVFC: org.openecomp.resource.abstract.nodes.VFC VF : org.openecomp.resource.abstract.nodes.VF + CR : org.openecomp.resource.abstract.nodes.CR PNF: org.openecomp.resource.abstract.nodes.PNF Service: org.openecomp.resource.abstract.nodes.service @@ -662,3 +666,65 @@ environmentContext: - Needed_Non-Revenue - Useful_Non-Revenue - General_Non-Revenue + +dmaapConsumerConfiguration: + hosts: olsd004.wnsnet.attws.com:3905 + consumerGroup: asdc + consumerId: mama #mama - in Order To Consume Remove This String And Replace It With -> mama + timeoutMs: 15000 + limit: 1 + pollingInterval: 2 + topic: com.att.sdc.23911-SDCforTestDev-v001 + latitude: 32.109333 + longitude: 34.855499 + version: 1.0 + serviceName: dmaap-v1.dev.dmaap.dt.saat.acsi.att.com/events + environment: TEST + partner: BOT_R + routeOffer: MR1 + protocol: https + contenttype: application/json + dme2TraceOn: true + aftEnvironment: AFTUAT + aftDme2ConnectionTimeoutMs: 15000 + aftDme2RoundtripTimeoutMs: 240000 + aftDme2ReadTimeoutMs: 50000 + dme2preferredRouterFilePath: DME2preferredRouter.txt + timeLimitForNotificationHandleMs: 120000 + credential: + username: m09875@sdc.att.com + password: hmXYcznAljMSisdy8zgcag== + + + +dmeConfiguration: + dme2Search: DME2SEARCH + dme2Resolve: DME2RESOLVE + + +excludedPolicyTypesMapping: + # VF: + # - a.b.c + # - c.d.e + #CR: + # - x.y.z + +excludedGroupTypesMapping: + CR: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - tosca.groups.Root + VF: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - tosca.groups.Root + Service: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - tosca.groups.Root + +healthStatusExclude: + - DE + - ES + - DMAAP + diff --git a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml index 60886cf40f..5ebbe82985 100644 --- a/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml +++ b/catalog-be/src/main/resources/config/distribution-engine-configuration.yaml @@ -45,4 +45,41 @@ createTopic: startDistributionEngine: true -useHttpsWithDmaap: true \ No newline at end of file + +useHttpsWithDmaap: false +opEnvRecoveryIntervalSec: 180 +allowedTimeBeforeStaleSec: 300 + +aaiConfig: + httpRequestConfig: + serverRootUrl: https://aai-uint3.test.att.com:8443 + resourceNamespaces: + operationalEnvironments: /aai/v12/cloud-infrastructure/operational-environments + + httpClientConfig: + timeouts: + readTimeoutMs: 5000 + connectTimeoutMs: 1000 + clientCertificate: + keyStore: /opt/app/jetty/base/be/etc/non-prod.jks + keyStorePassword: hmXYcznAljMSisdy8zgcag== + headers: + X-FromAppId: asdc + numOfRetries: 3 + +msoConfig: + httpRequestConfig: + serverRootUrl: http://127.0.0.1:8080/onap/mso/infra/modelDistributions/v1 + resourceNamespaces: + distributions: /distributions + + httpClientConfig: + timeouts: + readTimeoutMs: 2000 + connectTimeoutMs: 500 + basicAuthorization: + userName: asdc + password: OTLEp5lfVhYdyw5EAtTUBQ== + numOfRetries: 3 + +currentArtifactInstallationTimeout: 120 diff --git a/catalog-be/src/main/resources/config/error-configuration.yaml b/catalog-be/src/main/resources/config/error-configuration.yaml index 9dc0355212..56d0e74b73 100644 --- a/catalog-be/src/main/resources/config/error-configuration.yaml +++ b/catalog-be/src/main/resources/config/error-configuration.yaml @@ -8,6 +8,10 @@ errors: code: 201, message: "OK" } + ACCEPTED: { + code: 202, + message: "Accepted" + } NO_CONTENT: { code: 204, message: "No Content" @@ -411,7 +415,6 @@ errors: message: "Error: Invalid Content. Missing Capability Type '%1'.", messageId: "SVC4115" } -#-----------SVC4116--------------------------- RESOURCE_INSTANCE_BAD_REQUEST: { code: 400, message: "Error: Invalid Content.", @@ -595,7 +598,7 @@ errors: } #---------SVC4301------------------------------ RESTRICTED_OPERATION: { - code: 409, + code: 403, message: "Error: Restricted operation.", messageId: "SVC4301" } @@ -1187,6 +1190,7 @@ errors: message: "Error: Invalid occurrences format.", messageId: "SVC4585" } +#---------SVC4586------------------------------ #---------SVC4586------------------------------ INVALID_SERVICE_API_URL: { code: 400, @@ -1658,7 +1662,7 @@ errors: # %1 - "groupName" INVALID_VF_MODULE_NAME: { code: 400, - message: "Error: Invalid Content. VF Module name '%1' contains invalid characters", + message: "Error: Invalid Content. Group name '%1' contains invalid characters", messageId: "SVC4646" } @@ -1877,4 +1881,154 @@ errors: code: 404, message: "Error: Requested relation %1 was not found on the container %2.", messageId: "SVC4674" - } \ No newline at end of file + } + + +#---------SVC4675------------------------------ + INVALID_SERVICE_STATE: { + code: 409, + message: "Service state is invalid for this action", + messageId: "SVC4675" + } + +#---------SVC4676------------------------------ + 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: "SVC4676" + } + +#---------SVC4677------------------------------ + API_RESOURCE_NOT_FOUND: { + code: 404, + message: "Error: Requested '%1' was not found.", + messageId: "SVC4677" + } + +#---------SVC4678------------------------------ + BAD_REQUEST_MISSING_RESOURCE: { + code: 400, + message: "Error: The required resource name/id is missing in the request", + messageId: "SVC4678" + } +#---------SVC4679------------------------------ +# %1 forwarding path name maximum length + FORWARDING_PATH_NAME_MAXIMUM_LENGTH: { + code: 400, + message: "Forwarding path name too long, , maximum allowed 200 characters : '%1'.", + messageId: "SVC4679" + } +#---------SVC4680------------------------------ +# %1 Forwarding path name already in use + FORWARDING_PATH_NAME_ALREADY_IN_USE: { + code: 400, + message: "Forwarding path name already in use : '%1'.", + messageId: "SVC4680" + } +#---------SVC4681------------------------------ +# %1 Forwarding path name empty + FORWARDING_PATH_NAME_EMPTY: { + code: 400, + message: "Forwarding Path Name can't be empty .", + messageId: "SVC4681" + } +#---------SVC4682------------------------------ +# %1 - resource uniqueId +# %2 - resource component type + RESOURCE_CANNOT_CONTAIN_POLICIES: { + code: 400, + message: "Error: The resource %1 type of %2 cannot contain policies.", + messageId: "SVC4682" + } +#---------SVC4683------------------------------ +# %1 - policy uniqueId +# %2 - component uniqueId + POLICY_NOT_FOUND_ON_CONTAINER: { + code: 404, + message: "Error: Requested policy %1 was not found on the container %2.", + messageId: "SVC4683" +} +#---------SVC4684------------------------------ +# %1 - policy name + INVALID_POLICY_NAME: { + code: 400, + message: "Error: Invalid policy name %1 received.", + messageId: "SVC4684" + } +#---------SVC4685------------------------------ +# %1 - policy name + POLICY_NAME_ALREADY_EXIST: { + code: 409, + message: "Error: The policy with the name %1 already exists.", + messageId: "SVC4685" + } +#---------SVC4686------------------------------ +# %1 - policy name + POLICY_TARGET_DOES_NOT_EXIST: { + code: 400, + message: "Error: The targets %1 are not valid, all targets have to be on the topologyTemplate.", + messageId: "SVC4686" + } +#---------SVC4687------------------------------ +# %1 - policy type +# %2 - component type + EXCLUDED_POLICY_TYPE: { + code: 400, + message: "Error: The policy of the type %1 excluded to add to a component of the type %2.", + messageId: "SVC4687" + } + #---------SVC4688------------------------------ +# %1 - group type +# %2 - component type + GROUP_TYPE_ILLEGAL_PER_COMPONENT: { + code: 400, + message: "Error: group type %1 not permitted in component of type %2", + messageId: "SVC4688" + } + #---------SVC4689------------------------------ +# %1 - group type +# %2 - component type + POLICY_TARGET_TYPE_DOES_NOT_EXIST: { + code: 400, + message: "Error: The target types %1 are not valid.", + messageId: "SVC4689" + } + +#---------SVC4690------------------------------ +# %1 forwarding path protocol maximum length + FORWARDING_PATH_PROTOCOL_MAXIMUM_LENGTH: { + code: 400, + message: "Forwarding path protocol too long, , maximum allowed 200 characters : '%1'.", + messageId: "SVC4690" + } + +#---------SVC4691------------------------------ +# %1 forwarding path destination port maximum length + FORWARDING_PATH_DESTINATION_PORT_MAXIMUM_LENGTH: { + code: 400, + message: "Forwarding path destination port too long, , maximum allowed 200 characters : '%1'.", + messageId: "SVC4691" + } + +#---------POL4692------------------------------ + MISSING_OLD_COMPONENT_INSTANCE: { + code: 400 , + message: "Error: Missing 'componentInstanceId' HTTP param.", + messageId: "POL4692" + } + +#---------POL4693------------------------------ + MISSING_NEW_COMPONENT_INSTANCE: { + code: 400 , + message: "Error: Missing 'newComponentInstanceId' HTTP param.", + messageId: "POL4693" + } + +#---------SVC4694------------------------------ +# %1 External Reference Value + EXT_REF_NOT_FOUND: { + code: 404, + message: "Error: External Reference '%1' was not found.", + messageId: "SVC4694" + } + diff --git a/catalog-be/src/main/resources/config/logback.xml b/catalog-be/src/main/resources/config/logback.xml index ba16783536..b436f20c31 100644 --- a/catalog-be/src/main/resources/config/logback.xml +++ b/catalog-be/src/main/resources/config/logback.xml @@ -11,6 +11,8 @@ + + @@ -18,13 +20,11 @@ - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log - + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i - + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i 1 10 @@ -210,7 +210,7 @@ 20MB - ${default-log-pattern} + ${auditLoggerPattern} -- cgit 1.2.3-korg