summaryrefslogtreecommitdiffstats
path: root/asdc-controller/src/test/resources
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-03-14 02:07:32 -0400
committerRob Daugherty <rd472p@att.com>2018-03-14 04:08:41 -0400
commit38f720752af4d4aad8c4e467a288d9048659f688 (patch)
treee81066a8b5c77272e30fb57a64999573c4db4d86 /asdc-controller/src/test/resources
parentaee3d223f92a6f250f43e17558a2dfd576ff7294 (diff)
AT&T 1712 and 1802 release code
This is code from AT&T's 1712 and 1802 releases. Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04 Issue-ID: SO-425 Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'asdc-controller/src/test/resources')
-rw-r--r--asdc-controller/src/test/resources/mso-bad.json24
-rw-r--r--asdc-controller/src/test/resources/mso-with-NULL.json6
-rw-r--r--asdc-controller/src/test/resources/mso.asdc.clients.properties3
-rw-r--r--asdc-controller/src/test/resources/mso.asdc.json5
-rw-r--r--asdc-controller/src/test/resources/mso.json6
-rw-r--r--asdc-controller/src/test/resources/mso4-with-TLS.json6
6 files changed, 37 insertions, 13 deletions
diff --git a/asdc-controller/src/test/resources/mso-bad.json b/asdc-controller/src/test/resources/mso-bad.json
index be372fcb62..ce95756dfd 100644
--- a/asdc-controller/src/test/resources/mso-bad.json
+++ b/asdc-controller/src/test/resources/mso-bad.json
@@ -1,15 +1,13 @@
{
- "asdc-connections":{,
- "asdc-controller1":{
- "user": "testuser",
- "consumerGroup": "consumerGroup",
- "consumerId": "consumerId",
- "environmentName": "environmentName",
- "asdcAddress": "hostname1",
-
- "pollingInterval":10,
- "pollingTimeout":30
-
- }
- }
+ "asdc-connections": {
+ "asdc-controller1": {
+ "user": "testuser",
+ "consumerGroup": "consumerGroup",
+ "consumerId": "consumerId",
+ "environmentName": "environmentName",
+ "asdcAddress": "hostname1",
+ "pollingInterval": 10,
+ "pollingTimeout": 30
+ }
+ }
}
diff --git a/asdc-controller/src/test/resources/mso-with-NULL.json b/asdc-controller/src/test/resources/mso-with-NULL.json
index b7ef75b759..df215e691e 100644
--- a/asdc-controller/src/test/resources/mso-with-NULL.json
+++ b/asdc-controller/src/test/resources/mso-with-NULL.json
@@ -7,6 +7,12 @@
"environmentName": "environmentName",
"asdcAddress": "hostname",
"password": "1c551b8b5ab91fcd5a0907b11c304199",
+ "watchDogTimeout": "300",
+ "messageBusAddress": [
+ "uebsb91sfdc.it.att.com",
+ "uebsb92sfdc.it.att.com",
+ "uebsb93sfdc.it.att.com"
+ ],
"pollingInterval":10,
"pollingTimeout":30
diff --git a/asdc-controller/src/test/resources/mso.asdc.clients.properties b/asdc-controller/src/test/resources/mso.asdc.clients.properties
new file mode 100644
index 0000000000..e434dca366
--- /dev/null
+++ b/asdc-controller/src/test/resources/mso.asdc.clients.properties
@@ -0,0 +1,3 @@
+# This is a chef generated properties file! Manual updates will be overridden next chef-client run, ensure desired changes are in mso-config chef cookbook or chef env file.
+# tenant isolation
+aai.endpoint=http://localhost:28090
diff --git a/asdc-controller/src/test/resources/mso.asdc.json b/asdc-controller/src/test/resources/mso.asdc.json
new file mode 100644
index 0000000000..cbc18e8f31
--- /dev/null
+++ b/asdc-controller/src/test/resources/mso.asdc.json
@@ -0,0 +1,5 @@
+
+{
+ "components.count": 2
+}
+
diff --git a/asdc-controller/src/test/resources/mso.json b/asdc-controller/src/test/resources/mso.json
index d74ee07c6d..6b6b98c7da 100644
--- a/asdc-controller/src/test/resources/mso.json
+++ b/asdc-controller/src/test/resources/mso.json
@@ -7,6 +7,12 @@
"environmentName": "environmentName",
"asdcAddress": "hostname",
"password": "1c551b8b5ab91fcd5a0907b11c304199",
+ "watchDogTimeout": "300",
+ "messageBusAddress": [
+ "uebsb91sfdc.it.att.com",
+ "uebsb92sfdc.it.att.com",
+ "uebsb93sfdc.it.att.com"
+ ],
"pollingInterval":10,
"pollingTimeout":30
diff --git a/asdc-controller/src/test/resources/mso4-with-TLS.json b/asdc-controller/src/test/resources/mso4-with-TLS.json
index 8e7c506f2d..825ad5b42a 100644
--- a/asdc-controller/src/test/resources/mso4-with-TLS.json
+++ b/asdc-controller/src/test/resources/mso4-with-TLS.json
@@ -10,6 +10,12 @@
"pollingInterval":10,
"pollingTimeout":30,
"activateServerTLSAuth": true,
+ "watchDogTimeout": "300",
+ "messageBusAddress": [
+ "uebsb91sfdc.it.att.com",
+ "uebsb92sfdc.it.att.com",
+ "uebsb93sfdc.it.att.com"
+ ],
"keyStorePassword":"1c551b8b5ab91fcd5a0907b11c304199",
"keyStorePath": "/test"
}