diff options
21 files changed, 66 insertions, 35 deletions
diff --git a/common/src/test/resources/demo/config/DEMO.postman_collection.json b/common/src/test/resources/demo/config/DEMO.postman_collection.json index 72a8535d9..31c12bfc6 100644 --- a/common/src/test/resources/demo/config/DEMO.postman_collection.json +++ b/common/src/test/resources/demo/config/DEMO.postman_collection.json @@ -23,7 +23,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] @@ -84,7 +84,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] @@ -145,7 +145,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] @@ -202,7 +202,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] @@ -239,7 +239,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] @@ -275,7 +275,7 @@ }, { "key": "username", - "value": "healthcheck", + "value": "runtimeUser", "type": "string" } ] diff --git a/common/src/test/resources/demo/config/PolicyAPIConfig.json b/common/src/test/resources/demo/config/PolicyAPIConfig.json index 48e89c5dc..dbe00a135 100644 --- a/common/src/test/resources/demo/config/PolicyAPIConfig.json +++ b/common/src/test/resources/demo/config/PolicyAPIConfig.json @@ -3,7 +3,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6968, - "userName": "healthcheck", + "userName": "policyadmin", "password": "zb!XztG34", "https": false, "aaf": false diff --git a/common/src/test/resources/demo/config/RuntimeConfig.json b/common/src/test/resources/demo/config/RuntimeConfig.json index 529557eab..fd8948ab7 100644 --- a/common/src/test/resources/demo/config/RuntimeConfig.json +++ b/common/src/test/resources/demo/config/RuntimeConfig.json @@ -3,7 +3,7 @@ "restServerParameters": { "host": "0.0.0.0", "port": 6969, - "userName": "healthcheck", + "userName": "runtimeUser", "password": "zb!XztG34", "https": false, "aaf": false diff --git a/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json b/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json index b31c8ca01..6efddc256 100644 --- a/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json +++ b/common/src/test/resources/examples/controlloop/PMSH/pmsh.postman2.0_collection.json @@ -247,7 +247,7 @@ "auth": { "type": "basic", "basic": { - "username": "healthcheck", + "username": "runtimeUser", "password": "zb!XztG34" } } diff --git a/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json b/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json index 38deb43ae..798b0edd6 100644 --- a/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json +++ b/common/src/test/resources/examples/controlloop/http-participant/http.postman2.0_collection.json @@ -247,7 +247,7 @@ "auth": { "type": "basic", "basic": { - "username": "healthcheck", + "username": "runtimeUser", "password": "zb!XztG34" } } diff --git a/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json b/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json index 923782128..e83bc2594 100644 --- a/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json +++ b/common/src/test/resources/examples/controlloop/k8s-participant/k8s.postman2.0_collection.json @@ -247,7 +247,7 @@ "auth": { "type": "basic", "basic": { - "username": "healthcheck", + "username": "runtimeUser", "password": "zb!XztG34" } } diff --git a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml index b357ae424..14660a9ff 100644 --- a/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml +++ b/packages/policy-clamp-tarball/src/main/resources/etc/PolicyParticipantParameters.yaml @@ -11,7 +11,7 @@ participant: clientName: api hostname: policy-api port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true @@ -19,7 +19,7 @@ participant: clientName: pap hostname: policy-pap port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true diff --git a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml index 5839aae66..2aa33c1c4 100644 --- a/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-policy/src/main/resources/config/application.yaml @@ -11,7 +11,7 @@ participant: clientName: api hostname: policy-api port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true @@ -19,7 +19,7 @@ participant: clientName: pap hostname: policy-pap port: 6969 - userName: healthcheck + userName: policyadmin password: zb!XztG34 useHttps: true allowSelfSignedCerts: true diff --git a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java index 41af8a6ec..e965370cc 100644 --- a/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java +++ b/participant/participant-impl/participant-impl-policy/src/test/java/org/onap/policy/clamp/controlloop/participant/policy/main/parameters/CommonTestData.java @@ -84,7 +84,7 @@ public class CommonTestData { map.put("clientName", "pap"); map.put("hostname", "localhost"); map.put("port", 6968); - map.put("userName", "healthcheck"); + map.put("userName", "policyadmin"); map.put("password", "zb!XztG34"); map.put("https", false); map.put("allowSelfSignedCerts", true); @@ -101,7 +101,7 @@ public class CommonTestData { map.put("clientName", "api"); map.put("hostname", "localhost"); map.put("port", 6969); - map.put("userName", "healthcheck"); + map.put("userName", "policyadmin"); map.put("password", "zb!XztG34"); map.put("https", false); map.put("allowSelfSignedCerts", true); diff --git a/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties b/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties index f857704d3..49781407d 100644 --- a/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties +++ b/participant/participant-impl/participant-impl-policy/src/test/resources/application_test.properties @@ -7,7 +7,7 @@ server.http-port=8085 participant.policyApiParameters.clientName=api participant.policyApiParameters.hostname=localhost participant.policyApiParameters.port=6969 -participant.policyApiParameters.userName=healthcheck +participant.policyApiParameters.userName=policyadmin participant.policyApiParameters.password=zb!XztG34 participant.policyApiParameters.https=false participant.policyApiParameters.allowSelfSignedCerts=true diff --git a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml index 320b53805..d750d46d2 100644 --- a/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml +++ b/participant/participant-impl/participant-impl-simulator/src/main/resources/config/application.yaml @@ -1,7 +1,7 @@ spring: security: user: - name: healthcheck + name: runtimeUser password: zb!XztG34 server: diff --git a/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties b/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties index f162367f8..a4a1f99e5 100644 --- a/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties +++ b/participant/participant-impl/participant-impl-simulator/src/test/resources/application_test.properties @@ -1,4 +1,4 @@ -spring.security.user.name=healthcheck +spring.security.user.name=runtimeUser spring.security.user.password=zb!XztG34 server.servlet.context-path=/onap/participantsim @@ -6,7 +6,7 @@ server.error.path=/error participant.restServerParameters.host=0.0.0.0 participant.restServerParameters.port=6969 -participant.restServerParameters.userName=healthcheck +participant.restServerParameters.userName=runtimeUser participant.restServerParameters.password=zb!XztG34 participant.restServerParameters.https=false participant.restServerParameters.aaf=false diff --git a/runtime/src/main/resources/application-noaaf.properties b/runtime/src/main/resources/application-noaaf.properties index 12a08704f..9f13a314c 100644 --- a/runtime/src/main/resources/application-noaaf.properties +++ b/runtime/src/main/resources/application-noaaf.properties @@ -150,10 +150,10 @@ clamp.config.httpclient.connectTimeout=10000 # # Configuration Settings for Policy Engine Components clamp.config.policy.api.url=http://localhost:8085 -clamp.config.policy.api.userName=healthcheck +clamp.config.policy.api.userName=policyadmin clamp.config.policy.api.password=zb!XztG34 clamp.config.policy.pap.url=http://localhost:8085 -clamp.config.policy.pap.userName=healthcheck +clamp.config.policy.pap.userName=policyadmin clamp.config.policy.pap.password=zb!XztG34 # @@ -194,5 +194,5 @@ clamp.config.cds.password=ccsdkapps # Configuration settings for ControlLoop Runtime Rest API clamp.config.controlloop.runtime.url=http://localhost:6969 -clamp.config.controlloop.runtime.userName=healthcheck +clamp.config.controlloop.runtime.userName=runtimeUser clamp.config.controlloop.runtime.password=zb!XztG34 diff --git a/runtime/src/main/resources/application.properties b/runtime/src/main/resources/application.properties index 08260047e..21b37c69f 100644 --- a/runtime/src/main/resources/application.properties +++ b/runtime/src/main/resources/application.properties @@ -149,10 +149,10 @@ clamp.config.httpclient.connectTimeout=10000 # # Configuration Settings for Policy Engine Components clamp.config.policy.api.url=http://policy.api.simpledemo.onap.org:6969 -clamp.config.policy.api.userName=healthcheck +clamp.config.policy.api.userName=policyadmin clamp.config.policy.api.password=zb!XztG34 clamp.config.policy.pap.url=http://policy.api.simpledemo.onap.org:6969 -clamp.config.policy.pap.userName=healthcheck +clamp.config.policy.pap.userName=policyadmin clamp.config.policy.pap.password=zb!XztG34 # @@ -204,5 +204,5 @@ clamp.config.cds.password=ccsdkapps # Configuration settings for ControlLoop Runtime Rest API clamp.config.controlloop.runtime.url=http://localhost:6969 -clamp.config.controlloop.runtime.userName=healthcheck +clamp.config.controlloop.runtime.userName=runtimeUser clamp.config.controlloop.runtime.password=zb!XztG34 diff --git a/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItTestCase.java b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItTestCase.java index eeed51c12..79f3b12d7 100644 --- a/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItTestCase.java +++ b/runtime/src/test/java/org/onap/policy/clamp/clds/it/config/CldsReferencePropertiesItTestCase.java @@ -46,7 +46,7 @@ public class CldsReferencePropertiesItTestCase { */ @Test public void testGetStringValue() { - assertEquals("healthcheck", refProp.getStringValue("policy.api.userName")); + assertEquals("policyadmin", refProp.getStringValue("policy.api.userName")); } /** diff --git a/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeInstantiationResponseItTestCase.java b/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeInstantiationResponseItTestCase.java index ae80d0498..fdb815d75 100644 --- a/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeInstantiationResponseItTestCase.java +++ b/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeInstantiationResponseItTestCase.java @@ -41,6 +41,8 @@ public class RuntimeInstantiationResponseItTestCase { private static final String DIRECT_GET_TOSCA_INSTANTIATION = "direct:get-tosca-instantiation"; + private static final String DIRECT_POST_TOSCA_INSTANTANCE_PROPERTIES = "direct:post-tosca-instance-properties"; + private static final String SERVICE_TEMPLATE_NAME = "name"; private static final String SERVICE_TEMPLATE_VERSION = "version"; @@ -51,6 +53,12 @@ public class RuntimeInstantiationResponseItTestCase { + "\"version\": \"1.0.1\",\"definition\": {},\"state\": \"UNINITIALISED\",\"orderedState\": \"UNINITIALISED\"," + "\"description\": \"PMSH control loop instance 0\",\"elements\": {}}]}"; + private static final String SAMPLE_TOSCA_TEMPLATE = + "{\"tosca_definitions_version\": \"tosca_simple_yaml_1_1_0\"," + + "\"data_types\": {},\"node_types\": {}, \"policy_types\": {}," + + " \"topology_template\": {}," + + " \"name\": \"ToscaServiceTemplateSimple\", \"version\": \"1.0.0\", \"metadata\": {}}"; + @Test public void testToscaServiceTemplateStatus() { ProducerTemplate prodTemplate = camelContext.createProducerTemplate(); @@ -93,4 +101,18 @@ public class RuntimeInstantiationResponseItTestCase { assertThat(HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) .is2xxSuccessful()).isTrue(); } + + @Test + public void testCommissioningOfToscaServiceTemplateStatus() { + ProducerTemplate prodTemplate = camelContext.createProducerTemplate(); + + Exchange exchangeResponse = + prodTemplate.send(DIRECT_POST_TOSCA_INSTANTANCE_PROPERTIES, ExchangeBuilder.anExchange(camelContext) + .withBody(SAMPLE_TOSCA_TEMPLATE) + .withProperty("raiseHttpExceptionFlag", "true") + .build()); + + assertThat(HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) + .is2xxSuccessful()).isTrue(); + } } diff --git a/runtime/src/test/resources/application.properties b/runtime/src/test/resources/application.properties index bc0c290db..f2cf0dd33 100644 --- a/runtime/src/test/resources/application.properties +++ b/runtime/src/test/resources/application.properties @@ -139,10 +139,10 @@ clamp.config.httpclient.connectTimeout=10000 # # Configuration Settings for Policy Engine Components clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host} -clamp.config.policy.api.userName=healthcheck +clamp.config.policy.api.userName=policyadmin clamp.config.policy.api.password=zb!XztG34 clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host} -clamp.config.policy.pap.userName=healthcheck +clamp.config.policy.pap.userName=policyadmin clamp.config.policy.pap.password=zb!XztG34 # Sdc service properties @@ -183,5 +183,5 @@ clamp.config.tosca.converter.dictionary.support.enabled=true # Configuration settings for ControlLoop Runtime Rest API clamp.config.controlloop.runtime.url=http://localhost:${docker.http-cache.port.host} -clamp.config.controlloop.runtime.userName=healthcheck +clamp.config.controlloop.runtime.userName=runtimeUser clamp.config.controlloop.runtime.password=zb!XztG34 diff --git a/runtime/src/test/resources/http-cache/third_party_proxy.py b/runtime/src/test/resources/http-cache/third_party_proxy.py index 5c80cdda4..67af21470 100644 --- a/runtime/src/test/resources/http-cache/third_party_proxy.py +++ b/runtime/src/test/resources/http-cache/third_party_proxy.py @@ -331,6 +331,15 @@ class Proxy(SimpleHTTPServer.SimpleHTTPRequestHandler): jsonGenerated = "{\"controlLoopList\": [{\"name\": \"PMSHInstance0\",\"version\": \"1.0.1\",\"definition\": {},\"state\": \"UNINITIALISED\",\"orderedState\": \"UNINITIALISED\",\"description\": \"PMSH control loop instance 0\",\"elements\": {}}]}"; self._create_cache(jsonGenerated, cached_file_folder, cached_file_header, cached_file_content) return True + elif (self.path.startswith("/onap/controlloop/v2/instanceProperties")) and http_type == "POST": + print("self.path start with POST /onap/controlloop/v2/instanceProperties, copying body to response ...") + if not os.path.exists(cached_file_folder): + os.makedirs(cached_file_folder, 0o777) + with open(cached_file_header, 'w+') as f: + f.write("{\"Content-Length\": \"" + str(len(self.data_string)) + "\", \"Content-Type\": \""+str(self.headers['Content-Type'])+"\"}") + with open(cached_file_content, 'w+') as f: + f.write(self.data_string) + return True else: return False diff --git a/runtime/src/test/resources/robotframework/robotframework-test.properties b/runtime/src/test/resources/robotframework/robotframework-test.properties index 499719aa6..493c83c3d 100644 --- a/runtime/src/test/resources/robotframework/robotframework-test.properties +++ b/runtime/src/test/resources/robotframework/robotframework-test.properties @@ -136,10 +136,10 @@ clamp.config.httpclient.connectTimeout=10000 # # Configuration Settings for Policy Engine Components clamp.config.policy.api.url=http://localhost:${docker.http-cache.port.host} -clamp.config.policy.api.userName=healthcheck +clamp.config.policy.api.userName=policyadmin clamp.config.policy.api.password=zb!XztG34 clamp.config.policy.pap.url=http://localhost:${docker.http-cache.port.host} -clamp.config.policy.pap.userName=healthcheck +clamp.config.policy.pap.userName=policyadmin clamp.config.policy.pap.password=zb!XztG34 # Sdc service properties diff --git a/testsuites/performance/src/main/resources/testplans/performance.jmx b/testsuites/performance/src/main/resources/testplans/performance.jmx index bb0cfc98d..6b651a9f3 100644 --- a/testsuites/performance/src/main/resources/testplans/performance.jmx +++ b/testsuites/performance/src/main/resources/testplans/performance.jmx @@ -57,7 +57,7 @@ <collectionProp name="AuthManager.auth_list"> <elementProp name="" elementType="Authorization"> <stringProp name="Authorization.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/controlloop/v2</stringProp> - <stringProp name="Authorization.username">healthcheck</stringProp> + <stringProp name="Authorization.username">runtimeUser</stringProp> <stringProp name="Authorization.password">zb!XztG34</stringProp> <stringProp name="Authorization.domain"></stringProp> <stringProp name="Authorization.realm"></stringProp> diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 32bb36012..b5929c1e6 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -37,7 +37,7 @@ <collectionProp name="AuthManager.auth_list"> <elementProp name="" elementType="Authorization"> <stringProp name="Authorization.url">https://${RUNTIME_HOST}:${RUNTIME_PORT}/onap/controlloop/v2</stringProp> - <stringProp name="Authorization.username">healthcheck</stringProp> + <stringProp name="Authorization.username">runtimeUser</stringProp> <stringProp name="Authorization.password">zb!XztG34</stringProp> <stringProp name="Authorization.domain"></stringProp> <stringProp name="Authorization.realm"></stringProp> |