Rename to message-router

Modified the CSITs to use message-router for the simulator name.
Also added a Root CA so that the ssl certificates can be signed.
Removed property file overrides that are no longer needed.

Issue-ID: POLICY-3384
Change-Id: I6f1bc53f192567eeab0e71a64d9eaec814a38dd0
Signed-off-by: Jim Hahn <jrh3@att.com>

15 files changed, 0 insertions, 332 deletions

diff --git a/csit/config/drools-apps/custom/AAI-http-client.properties b/csit/config/drools-apps/custom/AAI-http-client.properties
deleted file mode 100644
index 35fa7f61..00000000
--- a/csit/config/drools-apps/custom/AAI-http-client.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-http.client.services=AAI
-
-http.client.services.AAI.managed=true
-http.client.services.AAI.https=true
-http.client.services.AAI.host=${envd:AAI_HOST}
-http.client.services.AAI.port=${envd:AAI_PORT}
-http.client.services.AAI.userName=${envd:AAI_USERNAME}
-http.client.services.AAI.password=${envd:AAI_PASSWORD}
-http.client.services.AAI.contextUriPath=${envd:AAI_CONTEXT_URI}
-http.client.services.AAI.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/APPC-CL-topic.properties b/csit/config/drools-apps/custom/APPC-CL-topic.properties
deleted file mode 100644
index f265b7c6..00000000
--- a/csit/config/drools-apps/custom/APPC-CL-topic.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.source.topics=APPC-CL
-dmaap.sink.topics=APPC-CL
-
-dmaap.source.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.APPC-CL.https=true
-dmaap.source.topics.APPC-CL.selfSignedCertificates=true
-
-dmaap.sink.topics.APPC-CL.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-CL.https=true
-dmaap.sink.topics.APPC-CL.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/APPC-LCM-READ-topic.properties b/csit/config/drools-apps/custom/APPC-LCM-READ-topic.properties
deleted file mode 100644
index f4a48dcb..00000000
--- a/csit/config/drools-apps/custom/APPC-LCM-READ-topic.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.sink.topics=APPC-LCM-READ
-
-dmaap.sink.topics.APPC-LCM-READ.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.APPC-LCM-READ.https=true
-dmaap.sink.topics.APPC-LCM-READ.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties b/csit/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties
deleted file mode 100644
index 51cb0183..00000000
--- a/csit/config/drools-apps/custom/APPC-LCM-WRITE-topic.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.source.topics=APPC-LCM-WRITE
-
-dmaap.source.topics.APPC-LCM-WRITE.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.APPC-LCM-WRITE.https=true
-dmaap.source.topics.APPC-LCM-WRITE.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/DCAE_CL_RSP-topic.properties b/csit/config/drools-apps/custom/DCAE_CL_RSP-topic.properties
deleted file mode 100644
index b02f90ce..00000000
--- a/csit/config/drools-apps/custom/DCAE_CL_RSP-topic.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.sink.topics=DCAE_CL_RSP
-
-dmaap.sink.topics.DCAE_CL_RSP.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.DCAE_CL_RSP.https=true
-dmaap.sink.topics.DCAE_CL_RSP.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/DCAE_TOPIC-topic.properties b/csit/config/drools-apps/custom/DCAE_TOPIC-topic.properties
deleted file mode 100644
index 608ba8d4..00000000
--- a/csit/config/drools-apps/custom/DCAE_TOPIC-topic.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.source.topics=DCAE_TOPIC
-
-dmaap.source.topics.DCAE_TOPIC.effectiveTopic=${env:DCAE_TOPIC}
-dmaap.source.topics.DCAE_TOPIC.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.DCAE_TOPIC.consumerGroup=${env:DCAE_CONSUMER_GROUP}
-dmaap.source.topics.DCAE_TOPIC.https=true
-dmaap.source.topics.DCAE_TOPIC.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/GUARD-http-client.properties b/csit/config/drools-apps/custom/GUARD-http-client.properties
deleted file mode 100644
index e4c2553a..00000000
--- a/csit/config/drools-apps/custom/GUARD-http-client.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-http.client.services=GUARD
-
-http.client.services.GUARD.managed=true
-http.client.services.GUARD.https=true
-http.client.services.GUARD.host=${envd:PDP_HOST}
-http.client.services.GUARD.port=${envd:PDP_PORT}
-http.client.services.GUARD.userName=${envd:PDP_USERNAME}
-http.client.services.GUARD.password=${envd:PDP_PASSWORD}
-http.client.services.GUARD.contextUriPath=${envd:PDP_CONTEXT_URI:policy/pdpx/v1/}
-http.client.services.GUARD.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/POLICY-CL-MGT-topic.properties b/csit/config/drools-apps/custom/POLICY-CL-MGT-topic.properties
deleted file mode 100644
index f2b68265..00000000
--- a/csit/config/drools-apps/custom/POLICY-CL-MGT-topic.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.sink.topics=POLICY-CL-MGT
-dmaap.sink.topics.POLICY-CL-MGT.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.POLICY-CL-MGT.https=true
-dmaap.sink.topics.POLICY-CL-MGT.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/SDNC-http-client.properties b/csit/config/drools-apps/custom/SDNC-http-client.properties
deleted file mode 100644
index 9115950e..00000000
--- a/csit/config/drools-apps/custom/SDNC-http-client.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-http.client.services=SDNC
-
-http.client.services.SDNC.managed=true
-http.client.services.SDNC.https=true
-http.client.services.SDNC.host=${envd:SDNC_HOST}
-http.client.services.SDNC.port=${envd:SDNC_PORT}
-http.client.services.SDNC.userName=${envd:SDNC_USERNAME}
-http.client.services.SDNC.password=${envd:SDNC_PASSWORD}
-http.client.services.SDNC.contextUriPath=${envd:SDNC_CONTEXT_URI}
-http.client.services.SDNC.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/SDNR-CL-RSP-topic.properties b/csit/config/drools-apps/custom/SDNR-CL-RSP-topic.properties
deleted file mode 100644
index 27a762c6..00000000
--- a/csit/config/drools-apps/custom/SDNR-CL-RSP-topic.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.source.topics=SDNR-CL-RSP
-dmaap.source.topics.SDNR-CL-RSP.servers=${env:DMAAP_SERVERS}
-dmaap.source.topics.SDNR-CL-RSP.https=true
-dmaap.source.topics.SDNR-CL-RSP.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/SDNR-CL-topic.properties b/csit/config/drools-apps/custom/SDNR-CL-topic.properties
deleted file mode 100644
index 8f2a26c2..00000000
--- a/csit/config/drools-apps/custom/SDNR-CL-topic.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-dmaap.sink.topics=SDNR-CL
-
-dmaap.sink.topics.SDNR-CL.servers=${env:DMAAP_SERVERS}
-dmaap.sink.topics.SDNR-CL.https=true
-dmaap.sink.topics.SDNR-CL.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/SO-http-client.properties b/csit/config/drools-apps/custom/SO-http-client.properties
deleted file mode 100644
index 7e71e359..00000000
--- a/csit/config/drools-apps/custom/SO-http-client.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-http.client.services=SO
-
-http.client.services.SO.managed=true
-http.client.services.SO.https=false
-http.client.services.SO.host=${envd:SO_HOST}
-http.client.services.SO.port=${envd:SO_PORT}
-http.client.services.SO.userName=${envd:SO_USERNAME}
-http.client.services.SO.password=${envd:SO_PASSWORD}
-http.client.services.SO.contextUriPath=${envd:SO_CONTEXT_URI}
-http.client.services.SO.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/VFC-http-client.properties b/csit/config/drools-apps/custom/VFC-http-client.properties
deleted file mode 100644
index 454e8a96..00000000
--- a/csit/config/drools-apps/custom/VFC-http-client.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2021 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=========================================================
-
-http.client.services=VFC
-
-http.client.services.VFC.managed=true
-http.client.services.VFC.https=true
-http.client.services.VFC.host=${envd:VFC_HOST}
-http.client.services.VFC.port=${envd:VFC_PORT}
-http.client.services.VFC.userName=${envd:VFC_USERNAME}
-http.client.services.VFC.password=${envd:VFC_PASSWORD}
-http.client.services.VFC.contextUriPath=${envd:VFC_CONTEXT_URI:api/nslcm/v1/}
-http.client.services.VFC.selfSignedCertificates=true
diff --git a/csit/config/drools-apps/custom/engine.properties b/csit/config/drools-apps/custom/engine.properties
index cf2ed855..8915385d 100644
--- a/csit/config/drools-apps/custom/engine.properties
+++ b/csit/config/drools-apps/custom/engine.properties
@@ -30,7 +30,6 @@ dmaap.source.topics.PDPD-CONFIGURATION.consumerGroup=${envd:PDPD_CONFIGURATION_C
 dmaap.source.topics.PDPD-CONFIGURATION.consumerInstance=${envd:PDPD_CONFIGURATION_CONSUMER_INSTANCE}
 dmaap.source.topics.PDPD-CONFIGURATION.managed=false
 dmaap.source.topics.PDPD-CONFIGURATION.https=true
-dmaap.source.topics.PDPD-CONFIGURATION.selfSignedCertificates=true
 
 http.server.services=SECURED-CONFIG
 
diff --git a/csit/config/drools-apps/custom/feature-lifecycle.properties b/csit/config/drools-apps/custom/feature-lifecycle.properties
index 2ce112ee..911cdca5 100644
--- a/csit/config/drools-apps/custom/feature-lifecycle.properties
+++ b/csit/config/drools-apps/custom/feature-lifecycle.properties
@@ -30,11 +30,9 @@ dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 dmaap.source.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
 dmaap.source.topics.POLICY-PDP-PAP.https=true
-dmaap.source.topics.POLICY-PDP-PAP.selfSignedCertificates=true
 
 dmaap.sink.topics.POLICY-PDP-PAP.servers=${envd:DMAAP_SERVERS}
 dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${envd:POLICY_PDP_PAP_TOPIC}
 dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${envd:POLICY_PDP_PAP_API_KEY}
 dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${envd:POLICY_PDP_PAP_API_SECRET}
 dmaap.sink.topics.POLICY-PDP-PAP.https=true
-dmaap.sink.topics.POLICY-PDP-PAP.selfSignedCertificates=true