aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-02-05 16:48:31 +0100
committersebdet <sebastien.determe@intl.att.com>2020-02-05 16:48:31 +0100
commite26a3dff78ccf173e5d9c1586bef7e4337f6e46c (patch)
tree6c41e94bd55f673b78895fb46897a15a5a8240fc
parent2249cf39e5ea07969a35754fc72db40d6de90904 (diff)
Remove bad urldublin
Remove bad url and remove useless files Issue-ID: CLAMP-642 Change-Id: I80109f242141dc9d0ea43a7451a22123bbf9f166 Signed-off-by: sebdet <sebastien.determe@intl.att.com>
-rw-r--r--src/test/resources/clds/holmes-old-style-ms.yaml6
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/holmes.yaml174
-rw-r--r--src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml8
3 files changed, 7 insertions, 181 deletions
diff --git a/src/test/resources/clds/holmes-old-style-ms.yaml b/src/test/resources/clds/holmes-old-style-ms.yaml
index 3f0c9a60..195efb67 100644
--- a/src/test/resources/clds/holmes-old-style-ms.yaml
+++ b/src/test/resources/clds/holmes-old-style-ms.yaml
@@ -1,9 +1,9 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
- - https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.3.0+t.0.4/node-type.yaml
- - https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
- - http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/1.2.0/dmaap.yaml
+ - https://nexus01:8443/repository/solutioning01-mte2-raw/type_files/docker/2.3.0+t.0.4/node-type.yaml
+ - https://nexus01:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
+ - http://nexus01:8081/repository/solutioning01-mte2-raw/type_files/dmaap/1.2.0/dmaap.yaml
inputs:
dcae_service_location:
type: string
diff --git a/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml b/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml
deleted file mode 100644
index f180a7df..00000000
--- a/src/test/resources/example/sdc/blueprint-dcae/holmes.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-tosca_definitions_version: cloudify_dsl_1_3
-imports:
-- http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/docker/2.3.0+t.0.4/node-type.yaml
-- https://nexus01.research.att.com:8443/repository/solutioning01-mte2-raw/type_files/relationship/1.0.0/node-type.yaml
-- http://nexus01.research.att.com:8081/repository/solutioning01-mte2-raw/type_files/dmaap/1.2.0/dmaap.yaml
-inputs:
- dcae_service_location:
- type: string
- docker_host_override:
- type: string
- topic0_aaf_password:
- type: string
- topic0_aaf_username:
- type: string
- topic0_client_role:
- type: string
- topic1_aaf_password:
- type: string
- topic1_aaf_username:
- type: string
- topic1_client_role:
- type: string
-node_templates:
- policy_0:
- type: dcae.nodes.policy
- properties:
- policy_model: policy.nodes.holmes
- policy_filter: "DCAE.Config_Holmes.*"
- docker_host_host:
- type: dcae.nodes.SelectedDockerHost
- properties:
- docker_host_override:
- get_input: docker_host_override
- location_id:
- get_input: dcae_service_location
- holmes-rule_homes-rule:
- type: dcae.nodes.DockerContainerForComponentsUsingDmaap
- properties:
- application_config:
- holmes.default.rule.volte.scenario1: 'package dcae.ves.test
-
- import org.onap.some.related.packages;
-
- rule"SameVNF_Relation_Rule"
-
- salience 120
-
- no-loop true
-
- when
-
- $root : VesAlarm(
-
- $sourceId: sourceId, sourceId != null && !sourceId.equals(""),
-
- specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ),
-
- $eventId: eventId)
-
- $child : VesAlarm( eventId != $eventId,
-
- CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),
-
- specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"),
-
- this after [-60s, 60s] $root)
-
- then
-
- DmaapService.publishResult(...);
-
- end'
- holmes.default.rule.volte.scenario2: 'package dcae.ves.test
-
- import org.onap.some.related.packages;
-
- rule"SameVNF_Relation_Rule_1"
-
- salience 120
-
- no-loop true
-
- when
-
- $root : VesAlarm(
-
- $sourceId: sourceId, sourceId != null && !sourceId.equals(""),
-
- specificProblem in ( "LSS_cpiPCSCFFailReg(121297)", "LSS_cpiSIPRetransmitInvite(120267)" ),
-
- $eventId: eventId)
-
- $child : VesAlarm( eventId != $eventId,
-
- CorrelationUtil.getInstance().isTopologicallyRelated(sourceId, $sourceId),
-
- specificProblem in ("LSS_externalLinkDown(4271)","LSS_failedAttachReqsRateExceeded(4272)"),
-
- this after [-60s, 60s] $root)
-
- then
-
- DmaapService.publishResult(...);
-
- end'
- services_calls:
- - msb_config:
- concat:
- - '{{'
- - get_property:
- - SELF
- - msb_config
- - node_name
- - '}}'
- streams_publishes: []
- streams_subscribes:
- - sec_measurement_unsecure:
- aaf_password:
- get_input: topic0_aaf_password
- aaf_username:
- get_input: topic0_aaf_username
- dmaap_info: <<topic0>>
- type: message_router
- - sec_measurement:
- aaf_password:
- get_input: topic1_aaf_password
- aaf_username:
- get_input: topic1_aaf_username
- dmaap_info: <<topic1>>
- type: message_router
- docker_config:
- healthcheck:
- endpoint: api/holmes-rule-mgmt/v1/healthcheck
- interval: 15s
- timeout: 1s
- type: http
- ports:
- - 9101:9101
- image: nexus3.onap.org:10001/onap/holmes/rule-manamgement:latest
- location_id:
- get_input: dcae_service_location
- service_component_type: dcae-analytics-holmes-rule-manamgement
- streams_publishes: []
- streams_subscribes:
- - client_role:
- get_input: topic0_client_role
- location:
- get_input: dcae_service_location
- name: topic0
- type: message_router
- - client_role:
- get_input: topic1_client_role
- location:
- get_input: dcae_service_location
- name: topic1
- type: message_router
- relationships:
- - target: docker_host_host
- type: dcae.relationships.component_contained_in
- - target: topic0
- type: dcae.relationships.subscribe_to_events
- - target: topic1
- type: dcae.relationships.subscribe_to_events
- - target: policy_0
- type: dcae.relationships.depends_on
- topic0:
- type: dcae.nodes.Topic
- properties:
- topic_name: ''
- topic1:
- type: dcae.nodes.Topic
- properties:
- topic_name: ''
diff --git a/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml b/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml
index 6522885f..8f5a122b 100644
--- a/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml
+++ b/src/test/resources/example/sdc/blueprint-dcae/not-recognized.yaml
@@ -1,8 +1,8 @@
tosca_definitions_version: cloudify_dsl_1_3
imports:
-- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dockerplugin/2.4.0+t.0.8/node-type.yaml
-- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dmaap/1.2.0+t.0.9/dmaap.yaml
-- http://dockercentral.it.att.com:8093/nexus/repository/rawcentral/com.att.dcae.controller/type_files/relationship/1.0.0+t.0.1/relationship-types.yaml
+- http://nexus:8843/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dockerplugin/2.4.0+t.0.8/node-type.yaml
+- http://nexus:8843/nexus/repository/rawcentral/com.att.dcae.controller/type_files/dmaap/1.2.0+t.0.9/dmaap.yaml
+- http://nexus:8843/nexus/repository/rawcentral/com.att.dcae.controller/type_files/relationship/1.0.0+t.0.1/relationship-types.yaml
inputs:
commonEventHeader.domain:
type: string
@@ -89,7 +89,7 @@ node_templates:
bind: /opt/app/vec/archive/data
host:
path: /opt/data/DCAE/dockermap/dockermap-archive
- image: dockercentral.it.att.com:5100/com.att.dcae.controller/dcae-controller-dockermap:18.02-004
+ image: nexus:8843/com.att.dcae.controller/dcae-controller-dockermap:18.02-004
location_id:
get_input: dcae_service_location
service_component_type: dcae.collectors.docker.map.pm