Update detmVers script for snapshots

The current script assumes that snapshot versions are always available.
However the Linux Foundation has now implemented a policy of deleting
snapshots on no-master branches that are older than a certain age. THis
breaks our CSITs.

This updated script copes with this by checking if a snapshot is
avaialable and, if the snapshot is not available, the script falls back
to the released version.

This script will be needed on other branches besides master as well.

CLAMP TOSCA Control Loop was not in Honolulu and the CLAMP CSITs ran
separately in the CLAMP repo. We ported the CSITs over to the
policy/docker repo in Istanbul. Therefore, we need to disable the CLAMP
CSITs in policy/docker in honolulu

Issue-ID: POLICY-4233
Change-Id: I83f0a6816942d5bfaef7c22fc69625f40ae74d23
Signed-off-by: liamfallon <liam.fallon@est.tech>

10 files changed, 14 insertions, 14 deletions

diff --git a/csit/config/apex-pdp/OnapPfConfig.json b/csit/config/apex-pdp/OnapPfConfig.json
index 59ba604d..d6deee32 100644
--- a/csit/config/apex-pdp/OnapPfConfig.json
+++ b/csit/config/apex-pdp/OnapPfConfig.json
@@ -26,14 +26,14 @@
     "topicParameterGroup": {
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps" : true,
             "allowSelfSignedCerts" : true
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps" : true,
             "allowSelfSignedCerts" : true
diff --git a/csit/config/drools-apps/custom/policy-keystore b/csit/config/drools-apps/custom/policy-keystore
new file mode 100644
index 00000000..76e93921
--- /dev/null
+++ b/csit/config/drools-apps/custom/policy-keystore
diff --git a/csit/config/drools-apps/custom/policy-truststore b/csit/config/drools-apps/custom/policy-truststore
new file mode 100644
index 00000000..d9730c43
--- /dev/null
+++ b/csit/config/drools-apps/custom/policy-truststore
diff --git a/csit/config/drools-apps/env/base.conf b/csit/config/drools-apps/env/base.conf
index 673cfaf3..5b08d343 100644
--- a/csit/config/drools-apps/env/base.conf
+++ b/csit/config/drools-apps/env/base.conf
@@ -91,16 +91,16 @@ PDP_ENVIRONMENT=TEST
 # DCAE DMaaP
 
 DCAE_TOPIC=unauthenticated.DCAE_CL_OUTPUT
-DCAE_SERVERS=policy.api.simpledemo.onap.org
+DCAE_SERVERS=simulator
 DCAE_CONSUMER_GROUP=dcae.policy.shared
 
 # Open DMaaP
 
-DMAAP_SERVERS=policy.api.simpledemo.onap.org
+DMAAP_SERVERS=simulator
 
 # AAI
 
-AAI_HOST=policy.api.simpledemo.onap.org
+AAI_HOST=simulator
 AAI_PORT=6666
 AAI_CONTEXT_URI=
 AAI_USERNAME=policy@policy.onap.org
@@ -108,16 +108,16 @@ AAI_PASSWORD=demo123456!
 
 # MSO
 
-SO_HOST=policy.api.simpledemo.onap.org
+SO_HOST=simulator
 SO_PORT=6669
 SO_CONTEXT_URI=
-SO_URL=https://policy.api.simpledemo.onap.org:6669/
+SO_URL=https://simulator:6669/
 SO_USERNAME=InfraPortalClient
 SO_PASSWORD=password1$
 
 # VFC
 
-VFC_HOST=policy.api.simpledemo.onap.org
+VFC_HOST=simulator
 VFC_PORT=6670
 VFC_CONTEXT_URI=
 VFC_USERNAME=
@@ -125,7 +125,7 @@ VFC_PASSWORD=
 
 # SDNC
 
-SDNC_HOST=policy.api.simpledemo.onap.org
+SDNC_HOST=simulator
 SDNC_PORT=6668
 SDNC_CONTEXT_URI=
 SDNC_USERNAME=
diff --git a/csit/config/drools/custom/policy-keystore b/csit/config/drools/custom/policy-keystore
new file mode 100644
index 00000000..76e93921
--- /dev/null
+++ b/csit/config/drools/custom/policy-keystore
diff --git a/csit/config/drools/custom/policy-truststore b/csit/config/drools/custom/policy-truststore
new file mode 100644
index 00000000..d9730c43
--- /dev/null
+++ b/csit/config/drools/custom/policy-truststore
diff --git a/csit/config/ks.jks b/csit/config/ks.jks
new file mode 100644
index 00000000..76e93921
--- /dev/null
+++ b/csit/config/ks.jks
diff --git a/csit/config/pap/defaultConfig.json b/csit/config/pap/defaultConfig.json
index 1fabd54e..0d324df5 100644
--- a/csit/config/pap/defaultConfig.json
+++ b/csit/config/pap/defaultConfig.json
@@ -32,21 +32,21 @@
     "topicParameterGroup": {
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps": true,
             "allowSelfSignedCerts" : true
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps": true,
             "allowSelfSignedCerts" : true
         },
         {
             "topic" : "POLICY-NOTIFICATION",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps": true,
             "allowSelfSignedCerts" : true
diff --git a/csit/config/policy-truststore b/csit/config/policy-truststore
new file mode 100644
index 00000000..d9730c43
--- /dev/null
+++ b/csit/config/policy-truststore
diff --git a/csit/config/xacml-pdp/defaultConfig.json b/csit/config/xacml-pdp/defaultConfig.json
index f489919a..6ff07395 100644
--- a/csit/config/xacml-pdp/defaultConfig.json
+++ b/csit/config/xacml-pdp/defaultConfig.json
@@ -22,14 +22,14 @@
     "topicParameterGroup": {
         "topicSources" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps" : true,
             "allowSelfSignedCerts" : true
         }],
         "topicSinks" : [{
             "topic" : "POLICY-PDP-PAP",
-            "servers" : [ "policy.api.simpledemo.onap.org" ],
+            "servers" : [ "simulator" ],
             "topicCommInfrastructure" : "dmaap",
             "useHttps" : true,
             "allowSelfSignedCerts" : true