diff options
author | Ravi Mantena <rx908f@att.com> | 2020-12-21 11:31:55 -0500 |
---|---|---|
committer | Ravi Mantena <rx908f@att.com> | 2020-12-21 11:32:34 -0500 |
commit | a520d00e005db1b232b9dae0c70d4dc5d73b33e1 (patch) | |
tree | 9c0e16ce5fab9bc12da138c4d8c613bcff54516b /mod/bpgenerator/onap/src/test/resources | |
parent | 2f551ba584dbb70568a69144b39e6da7c55c517f (diff) |
BpGen refactor Code Quality Issue-ID: DCAEGEN2-2502
Issue-ID: DCAEGEN2-2502
Change-Id: If6e08f0bb88c9039fb27898d50d2645f79175ba4
Signed-off-by: Ravi Mantena <rx908f@att.com>
Diffstat (limited to 'mod/bpgenerator/onap/src/test/resources')
6 files changed, 201 insertions, 213 deletions
diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsFalseAndExternalTlsFalse.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsFalseAndExternalTlsFalse.json index da75ab8..8234605 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsFalseAndExternalTlsFalse.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsFalseAndExternalTlsFalse.json @@ -1,43 +1,40 @@ { - "self": { - "component_type": "docker", - "description": "Test component spec", - "name": "test.component.spec", - "version": "1.0.1" - }, - - "services": { - "calls": [], - "provides": [] - }, - - "streams": { - "publishes": [], - "subscribes": [] - }, - - "parameters": [], - - "auxilary": { - "healthcheck": { - "type": "docker", - "interval": "300s", - "timeout": "120s", - "script": "/etc/init.d/nagios status" - }, - "ports": [ - "80:80", - "99:99" - ], - "tls_info": { - "cert_directory": "/opt/app/dcae-certificate/", - "use_tls": false, - "use_external_tls": false - } - }, - "artifacts": [{ - "type": "docker image", - "uri": "test.tester" - }] - + "self": { + "component_type": "docker", + "description": "Test component spec", + "name": "test.component.spec", + "version": "1.0.1" + }, + "services": { + "calls": [], + "provides": [] + }, + "streams": { + "publishes": [], + "subscribes": [] + }, + "parameters": [], + "auxilary": { + "healthcheck": { + "type": "docker", + "interval": "300s", + "timeout": "120s", + "script": "/etc/init.d/nagios status" + }, + "ports": [ + "80:80", + "99:99" + ], + "tls_info": { + "cert_directory": "/opt/app/dcae-certificate/", + "use_tls": false, + "use_external_tls": false + } + }, + "artifacts": [ + { + "type": "docker image", + "uri": "test.tester" + } + ] } diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndExternalTlsTrue.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndExternalTlsTrue.json index f13e3fd..20709e9 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndExternalTlsTrue.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndExternalTlsTrue.json @@ -1,43 +1,40 @@ { - "self": { - "component_type": "docker", - "description": "Test component spec", - "name": "test.component.spec", - "version": "1.0.1" - }, - - "services": { - "calls": [], - "provides": [] - }, - - "streams": { - "publishes": [], - "subscribes": [] - }, - - "parameters": [], - - "auxilary": { - "healthcheck": { - "type": "docker", - "interval": "300s", - "timeout": "120s", - "script": "/etc/init.d/nagios status" - }, - "ports": [ - "80:80", - "99:99" - ], - "tls_info": { - "cert_directory": "/opt/app/dcae-certificate/", - "use_tls": true, - "use_external_tls": true - } - }, - "artifacts": [{ - "type": "docker image", - "uri": "test.tester" - }] - + "self": { + "component_type": "docker", + "description": "Test component spec", + "name": "test.component.spec", + "version": "1.0.1" + }, + "services": { + "calls": [], + "provides": [] + }, + "streams": { + "publishes": [], + "subscribes": [] + }, + "parameters": [], + "auxilary": { + "healthcheck": { + "type": "docker", + "interval": "300s", + "timeout": "120s", + "script": "/etc/init.d/nagios status" + }, + "ports": [ + "80:80", + "99:99" + ], + "tls_info": { + "cert_directory": "/opt/app/dcae-certificate/", + "use_tls": true, + "use_external_tls": true + } + }, + "artifacts": [ + { + "type": "docker image", + "uri": "test.tester" + } + ] } diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndNoExternalTls.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndNoExternalTls.json index 517c461..cb73af7 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndNoExternalTls.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withTlsTrueAndNoExternalTls.json @@ -1,42 +1,39 @@ { - "self": { - "component_type": "docker", - "description": "Test component spec", - "name": "test.component.spec", - "version": "1.0.1" - }, - - "services": { - "calls": [], - "provides": [] - }, - - "streams": { - "publishes": [], - "subscribes": [] - }, - - "parameters": [], - - "auxilary": { - "healthcheck": { - "type": "docker", - "interval": "300s", - "timeout": "120s", - "script": "/etc/init.d/nagios status" - }, - "ports": [ - "80:80", - "99:99" - ], - "tls_info": { - "cert_directory": "/opt/app/dcae-certificate/", - "use_tls": true - } - }, - "artifacts": [{ - "type": "docker image", - "uri": "test.tester" - }] - + "self": { + "component_type": "docker", + "description": "Test component spec", + "name": "test.component.spec", + "version": "1.0.1" + }, + "services": { + "calls": [], + "provides": [] + }, + "streams": { + "publishes": [], + "subscribes": [] + }, + "parameters": [], + "auxilary": { + "healthcheck": { + "type": "docker", + "interval": "300s", + "timeout": "120s", + "script": "/etc/init.d/nagios status" + }, + "ports": [ + "80:80", + "99:99" + ], + "tls_info": { + "cert_directory": "/opt/app/dcae-certificate/", + "use_tls": true + } + }, + "artifacts": [ + { + "type": "docker image", + "uri": "test.tester" + } + ] } diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withoutTlsInfo.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withoutTlsInfo.json index a94c987..a247b2c 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withoutTlsInfo.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/testComponentSpec_withoutTlsInfo.json @@ -1,38 +1,35 @@ { - "self": { - "component_type": "docker", - "description": "Test component spec", - "name": "test.component.spec", - "version": "1.0.1" - }, - - "services": { - "calls": [], - "provides": [] - }, - - "streams": { - "publishes": [], - "subscribes": [] - }, - - "parameters": [], - - "auxilary": { - "healthcheck": { - "type": "docker", - "interval": "300s", - "timeout": "120s", - "script": "/etc/init.d/nagios status" - }, - "ports": [ - "80:80", - "99:99" - ] - }, - "artifacts": [{ - "type": "docker image", - "uri": "test.tester" - }] - + "self": { + "component_type": "docker", + "description": "Test component spec", + "name": "test.component.spec", + "version": "1.0.1" + }, + "services": { + "calls": [], + "provides": [] + }, + "streams": { + "publishes": [], + "subscribes": [] + }, + "parameters": [], + "auxilary": { + "healthcheck": { + "type": "docker", + "interval": "300s", + "timeout": "120s", + "script": "/etc/init.d/nagios status" + }, + "ports": [ + "80:80", + "99:99" + ] + }, + "artifacts": [ + { + "type": "docker image", + "uri": "test.tester" + } + ] } diff --git a/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json b/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json index 6655a2c..822a7b1 100644 --- a/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json +++ b/mod/bpgenerator/onap/src/test/resources/componentspecs/ves.json @@ -12,14 +12,14 @@ "version": "1.0.0", "route": "/TEST_HELLO_WORLD_SUB_MR", "type": "message_router", - "config_key": "TEST-SUB-MR" + "config_key": "TEST-SUB-MR" }, { "format": "dataformat_Hello_World_PM DR", "version": "1.0.0", - "route": "/TEST_HELLO_WORLD_SUB_DR", + "route": "/TEST_HELLO_WORLD_SUB_DR", "type": "data_router", - "config_key": "TEST-SUB-DR" + "config_key": "TEST-SUB-DR" } ], "publishes": [ @@ -27,37 +27,37 @@ "format": "VES_specification", "version": "5.28.4", "type": "message router", - "config_key": "ves-fault" + "config_key": "ves-fault" }, { "format": "VES_specification", "version": "5.28.4", "type": "message router", - "config_key": "ves-measurement" + "config_key": "ves-measurement" }, { "format": "VES_specification", "version": "5.28.4", "type": "message router", - "config_key": "ves-other" + "config_key": "ves-other" }, { "format": "VES_specification", "version": "5.28.4", "type": "message router", - "config_key": "ves-heartbeat-secondary" + "config_key": "ves-heartbeat-secondary" }, { "format": "VES_specification", "version": "7.30.0", "type": "message router", - "config_key": "ves-pnfRegistration" + "config_key": "ves-pnfRegistration" }, { "format": "VES_specification", "version": "7.30.0", "type": "message router", - "config_key": "ves-notification" + "config_key": "ves-notification" } ] }, @@ -242,24 +242,24 @@ "sourced_at_deployment": true, "policy_editable": true, "policy_group": "Test_Parameters", - "required": true, + "required": true, "designer_editable": true, "policy_schema": [ - { - "name": "PolicySchemaTest", - "description": "List of objects for vnf type monitorng", - "type": "String", - "entry_schema": [ - { - "name": "TestEntrySchema", - "description": "entry", - "type": "string", - "value": "None" - } - ] - } + { + "name": "PolicySchemaTest", + "description": "List of objects for vnf type monitorng", + "type": "String", + "entry_schema": [ + { + "name": "TestEntrySchema", + "description": "entry", + "type": "string", + "value": "None" + } + ] + } ] - }, + }, { "name": "tomcat.maxthreads", "value": "200", @@ -281,17 +281,17 @@ "interval": "15s", "timeout": "1s", "endpoint": "/livehealthcheck" - }, + }, "databases": { "dti": "postgres" - }, + }, "reconfigs": { "app_reconfig": "abc" - }, + }, "policy": { "trigger_type": "docker", - "script_path": "/opt/app/manager/bin/reconfigure.sh" - }, + "script_path": "/opt/app/manager/bin/reconfigure.sh" + }, "volumes": [ { "container": { diff --git a/mod/bpgenerator/onap/src/test/resources/policyjson/policyInput.json b/mod/bpgenerator/onap/src/test/resources/policyjson/policyInput.json index fb89e1a..4e413d1 100644 --- a/mod/bpgenerator/onap/src/test/resources/policyjson/policyInput.json +++ b/mod/bpgenerator/onap/src/test/resources/policyjson/policyInput.json @@ -1,28 +1,28 @@ { - "policies": [ - { - "configAttributes": "", - "configName": "", - "onapName": "DCAE", - "policyName": "DCAE.Config_*", - "unique": false - }, - { - "onapName": "DCAE", - "policyName": "DCAE.Config_*", - "unique": true - }, - { - "configAttributes": "", - "configName": "", - "onapName": "DCAE", - "policyName": "DCAE.Config_*", - "unique": false - } - ], - "policy": [ - { - "policy_id" : "id_0" - } - ] + "policies": [ + { + "configAttributes": "", + "configName": "", + "onapName": "DCAE", + "policyName": "DCAE.Config_*", + "unique": false + }, + { + "onapName": "DCAE", + "policyName": "DCAE.Config_*", + "unique": true + }, + { + "configAttributes": "", + "configName": "", + "onapName": "DCAE", + "policyName": "DCAE.Config_*", + "unique": false + } + ], + "policy": [ + { + "policy_id": "id_0" + } + ] }
\ No newline at end of file |