From: a.sreekumar Date: Thu, 22 Oct 2020 11:50:24 +0000 (+0100) Subject: Policy-PAP S3P jmx changes X-Git-Tag: 2.4.0~23 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fpap.git;a=commitdiff_plain;h=f2097279954d4fd3d1118130863a2ec1b63574e3 Policy-PAP S3P jmx changes Change-Id: Ie6e57eb0a5f2174cfa934b65db8e1badaad7fe85 Issue-ID: POLICY-2830 Signed-off-by: a.sreekumar --- diff --git a/testsuites/performance/src/main/resources/testplans/perf.jmx b/testsuites/performance/src/main/resources/testplans/perf.jmx index c7f0b927..093b5aed 100644 --- a/testsuites/performance/src/main/resources/testplans/perf.jmx +++ b/testsuites/performance/src/main/resources/testplans/perf.jmx @@ -5,6 +5,7 @@ ================================================================================ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2020 Nordix Foundation. + Modifications Copyright (C) 2020 Bell Canada. 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. @@ -19,10 +20,10 @@ limitations under the License. ============LICENSE_END========================================================= --> - + - - Policy PAP Stability Tests + + Policy PAP Performance Tests false true true @@ -30,22 +31,22 @@ PAP_HOST - ${__P(PAP_HOST,10.2.0.163)} + ${__P(PAP_HOST,10.2.0.29)} = PAP_PORT - ${__P(PAP_PORT,6969)} + ${__P(PAP_PORT,30679)} = API_HOST - ${__P(API_HOST,10.2.0.135)} + ${__P(API_HOST,10.2.0.29)} = API_PORT - ${__P(API_PORT,6969)} + ${__P(API_PORT,30859)} = @@ -53,16 +54,6 @@ ${__P(HOME,/home/adityap)} = - - CONFIG_DIR - ${HOME_PATH}/pap/testsuites/stability/src/main/resources/simulatorsetup/ - = - - - DIR - ${HOME_PATH}/pap/testsuites/performance/src/main/resources/testplans/ - = - LOGS_PATH ${HOME_PATH}/pap_perf/ @@ -75,7 +66,7 @@ USERS - ${__P(USERS,5) + ${__P(USERS,5)} = @@ -131,303 +122,6 @@ true - - true - - - - false - { - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "policy_types": { - "onap.policies.controlloop.operational.Apex": { - "version": "1.0.0", - "description": "Operational Policy for Control Loops using the APEX PDP", - "properties": { - "engine_service": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EngineService", - "description": "APEX Engine Service Parameters" - }, - "inputs": { - "type": "map", - "description": "Inputs for handling events coming into the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler" - } - }, - "outputs": { - "type": "map", - "description": "Outputs for handling events going out of the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler" - } - }, - "environment": { - "type": "list", - "description": "Envioronmental parameters for the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Environment" - } - } - } - } - }, - "data_types": { - "onap.datatypes.policies.controlloop.operational.apex.EngineService": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "Specifies the engine name", - "required": false, - "default": "ApexEngineService" - }, - "version": { - "type": "string", - "description": "Specifies the engine version in double dotted format", - "required": false, - "default": "1.0.0" - }, - "id": { - "type": "integer", - "description": "Specifies the engine id", - "required": true - }, - "instance_count": { - "type": "integer", - "description": "Specifies the number of engine threads that should be run", - "required": true - }, - "deployment_port": { - "type": "integer", - "description": "Specifies the port to connect to for engine administration", - "required": false, - "default": 1 - }, - "policy_model_file_name": { - "type": "string", - "description": "The name of the file from which to read the APEX policy model", - "required": false - }, - "policy_type_impl": { - "type": "string", - "description": "The policy type implementation from which to read the APEX policy model", - "required": false - }, - "periodic_event_period": { - "type": "string", - "description": "The time interval in milliseconds for the periodic scanning event, 0 means \"don't scan\"", - "required": false, - "default": 0 - }, - "engine": { - "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine", - "description": "The parameters for all engines in the APEX engine service", - "required": true - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.EventHandler": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "Specifies the event handler name, if not specified this is set to the key name", - "required": false - }, - "carrier_technology": { - "type": "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology", - "description": "Specifies the carrier technology of the event handler (such as REST/Web Socket/Kafka)", - "required": true - }, - "event_protocol": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventProtocol", - "description": "Specifies the event protocol of events for the event handler (such as Yaml/JSON/XML/POJO)", - "required": true - }, - "event_name": { - "type": "string", - "description": "Specifies the event name for events on this event handler, if not specified, the event name is read from or written to the event being received or sent", - "required": false - }, - "event_name_filter": { - "type": "string", - "description": "Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through", - "required": false - }, - "synchronous_mode": { - "type": "boolean", - "description": "Specifies the event handler is syncronous (receive event and send response)", - "required": false, - "default": false - }, - "synchronous_peer": { - "type": "string", - "description": "The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode", - "required": false - }, - "synchronous_timeout": { - "type": "integer", - "description": "The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode", - "required": false - }, - "requestor_mode": { - "type": "boolean", - "description": "Specifies the event handler is in requestor mode (send event and wait for response mode)", - "required": false, - "default": false - }, - "requestor_peer": { - "type": "string", - "description": "The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode", - "required": false - }, - "requestor_timeout": { - "type": "integer", - "description": "The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "label": { - "type": "string", - "description": "The label (name) of the carrier technology (such as REST, Kafka, WebSocket)", - "required": true - }, - "plugin_parameter_class_name": { - "type": "string", - "description": "The class name of the class that overrides default handling of event input or output for this carrier technology, defaults to the supplied input or output class", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.EventProtocol": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "label": { - "type": "string", - "description": "The label (name) of the event protocol (such as Yaml, JSON, XML, or POJO)", - "required": true - }, - "event_protocol_plugin_class": { - "type": "string", - "description": "The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.Environment": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "The name of the environment variable", - "required": true - }, - "value": { - "type": "string", - "description": "The value of the environment variable", - "required": true - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "context": { - "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context", - "description": "The properties for handling context in APEX engines, defaults to using Java maps for context", - "required": false - }, - "executors": { - "type": "map", - "description": "The plugins for policy executors used in engines such as javascript, MVEL, Jython", - "required": true, - "entry_schema": { - "description": "The plugin class path for this policy executor", - "type": "string" - } - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "distributor": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for distributing context between APEX PDPs at runtime", - "required": false - }, - "schemas": { - "type": "map", - "description": "The plugins for context schemas available in APEX PDPs such as Java and Avro", - "required": false, - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin" - } - }, - "locking": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for locking context in and between APEX PDPs at runtime", - "required": false - }, - "persistence": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for persisting context for APEX PDPs at runtime", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.Plugin": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "The name of the executor such as Javascript, Jython or MVEL", - "required": true - }, - "plugin_class_name": { - "type": "string", - "description": "The class path of the plugin class for this executor" - } - } - } - } -} - - = - - - - ${API_HOST} - ${API_PORT} - https - - policy/api/v1/policytypes - POST - true - false - true - false - - - - - - - - 200 - - - Assertion.response_code - false - 1 - - - true @@ -440,7 +134,7 @@ "policies": [ { "operational.apex.stabilityTestDefaultDomain": { - "type": "onap.policies.controlloop.operational.Apex", + "type": "onap.policies.controlloop.operational.common.Apex", "type_version": "1.0.0", "version": "1.0.0", "metadata": { @@ -7882,7 +7576,7 @@ ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies + /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/policies POST true false @@ -7916,7 +7610,7 @@ "policies": [ { "operational.apex.stabilityTestSampleDomain": { - "type": "onap.policies.controlloop.operational.Apex", + "type": "onap.policies.native.Apex", "type_version": "1.0.0", "version": "1.0.0", "metadata": { @@ -15358,7 +15052,7 @@ ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies + /policy/api/v1/policytypes/onap.policies.native.Apex/versions/1.0.0/policies POST true false @@ -15561,25 +15255,6 @@ if (prev.getResponseCode() == '200') { 1 - - groovy - - - true - import groovy.json.JsonSlurper; - -def res = []; -if (prev.getResponseCode() == '200') { - def jsonSlurper = new JsonSlurper(); - res = jsonSlurper.parseText(prev.getResponseDataAsString()); - - assert res instanceof Map; - assert res.groups.size == 1; - assert res.groups[0].pdpGroupState== 'ACTIVE'; -} - - - 1 @@ -15590,7 +15265,7 @@ if (prev.getResponseCode() == '200') { - + Deploy defaultDomain policy ${threadCounter}%5==1 false @@ -15656,11 +15331,11 @@ if (prev.getResponseCode() == '200') { "pdpSubgroups": [ { "pdpType": "apex", - "desiredInstanceCount": 2, + "desiredInstanceCount": 1, "properties": {}, "supportedPolicyTypes": [ { - "name": "onap.policies.controlloop.operational.Apex", + "name": "onap.policies.native.Apex", "version": "1.0.0" } ], @@ -15701,35 +15376,6 @@ if (prev.getResponseCode() == '200') { - - false - 0 - ${DIR}pdp_sim_startup.sh - - - - - ${CONFIG_DIR} - = - - - - 1 - = - - - - - - - ${DIR} - - - - 5000 - - - @@ -15750,16 +15396,6 @@ if (prev.getResponseCode() == '200') { Check PdpGroup Query - - - 200 - - - Assertion.response_code - false - 1 - - groovy @@ -15773,25 +15409,22 @@ if (prev.getResponseCode() == '200') { res = jsonSlurper.parseText(prev.getResponseDataAsString()); assert res instanceof Map; - assert res.groups.size >1; - - for(int groupSize=0;groupSize<res.groups.size;groupSize++){ - - - def pdpSubGrp=res.groups[0].pdpSubgroups; - - if (res.groups[0].name == 'defaultGroup'){ - assert pdpSubGrp[0].policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; - }else if(res.groups[0].name == 'sampleGroup' ){ - assert pdpSubGrp[0].policies.size == 0; - - } - - } + assert res.groups.size == 1; + assert res.groups[0].pdpGroupState== 'ACTIVE'; } + + + 200 + + + Assertion.response_code + false + 1 + + true @@ -15848,7 +15481,7 @@ if (prev.getResponseCode() == '200') { - + 500 @@ -15946,44 +15579,8 @@ if (prev.getResponseCode() == '200') { 1 - - groovy - - - true - import groovy.json.JsonSlurper; - -def res = []; -if (prev.getResponseCode() == '200') { - def jsonSlurper = new JsonSlurper(); - res = jsonSlurper.parseText(prev.getResponseDataAsString()); - assert res.size >1 ; - -} - - - - - false - 0 - ${DIR}pdp_sim_stop.sh - - - - - 1 - = - - - - - - - ${DIR} - - - + 500 @@ -16042,7 +15639,7 @@ if (prev.getResponseCode() == '200') { - + ${threadCounter}%5==1 false @@ -16139,25 +15736,6 @@ if (prev.getResponseCode() == '200') { children - - groovy - - - true - import groovy.json.JsonSlurper; - -def res = []; -if (prev.getResponseCode() == '200') { - def jsonSlurper = new JsonSlurper(); - res = jsonSlurper.parseText(prev.getResponseDataAsString()); - - assert res instanceof Map; - assert res.groups.size > 0; - assert res.groups[0].pdpGroupState== 'PASSIVE'; -} - - - @@ -16272,37 +15850,7 @@ if (prev.getResponseCode() == '200') { ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies/operational.apex.stabilityTestSampleDomain/versions/1.0.0 - DELETE - true - false - true - false - - - - - - - - 200 - - - Assertion.response_code - false - 1 - - - - - - - - ${API_HOST} - ${API_PORT} - https - - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0 + /policy/api/v1/policytypes/onap.policies.native.Apex/versions/1.0.0/policies/operational.apex.stabilityTestSampleDomain/versions/1.0.0 DELETE true false diff --git a/testsuites/stability/src/main/resources/testplans/stability.jmx b/testsuites/stability/src/main/resources/testplans/stability.jmx index 89fbb037..760f4cd8 100644 --- a/testsuites/stability/src/main/resources/testplans/stability.jmx +++ b/testsuites/stability/src/main/resources/testplans/stability.jmx @@ -5,6 +5,7 @@ ================================================================================ Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. Modifications Copyright (C) 2019 - 2020 Nordix Foundation. + Modifications Copyright (C) 2020 Bell Canada. 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. @@ -19,7 +20,7 @@ limitations under the License. ============LICENSE_END========================================================= --> - + Policy PAP Stability Tests @@ -30,32 +31,22 @@ PAP_HOST - 10.2.0.163 + 10.2.0.29 = PAP_PORT - 6969 + 30679 = API_HOST - 10.2.0.135 + 10.2.0.29 = API_PORT - 6969 - = - - - DIR - /home/adityap/pap/testsuites/stability/src/main/resources/testplans/ - = - - - CONFIG_DIR - /home/adityap/pap/testsuites/stability/src/main/resources/simulatorsetup/ + 30859 = @@ -111,303 +102,6 @@ true - - true - - - - false - { - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "policy_types": { - "onap.policies.controlloop.operational.Apex": { - "version": "1.0.0", - "description": "Operational Policy for Control Loops using the APEX PDP", - "properties": { - "engine_service": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EngineService", - "description": "APEX Engine Service Parameters" - }, - "inputs": { - "type": "map", - "description": "Inputs for handling events coming into the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler" - } - }, - "outputs": { - "type": "map", - "description": "Outputs for handling events going out of the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventHandler" - } - }, - "environment": { - "type": "list", - "description": "Envioronmental parameters for the APEX engine", - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Environment" - } - } - } - } - }, - "data_types": { - "onap.datatypes.policies.controlloop.operational.apex.EngineService": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "Specifies the engine name", - "required": false, - "default": "ApexEngineService" - }, - "version": { - "type": "string", - "description": "Specifies the engine version in double dotted format", - "required": false, - "default": "1.0.0" - }, - "id": { - "type": "integer", - "description": "Specifies the engine id", - "required": true - }, - "instance_count": { - "type": "integer", - "description": "Specifies the number of engine threads that should be run", - "required": true - }, - "deployment_port": { - "type": "integer", - "description": "Specifies the port to connect to for engine administration", - "required": false, - "default": 1 - }, - "policy_model_file_name": { - "type": "string", - "description": "The name of the file from which to read the APEX policy model", - "required": false - }, - "policy_type_impl": { - "type": "string", - "description": "The policy type implementation from which to read the APEX policy model", - "required": false - }, - "periodic_event_period": { - "type": "string", - "description": "The time interval in milliseconds for the periodic scanning event, 0 means \"don't scan\"", - "required": false, - "default": 0 - }, - "engine": { - "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine", - "description": "The parameters for all engines in the APEX engine service", - "required": true - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.EventHandler": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "Specifies the event handler name, if not specified this is set to the key name", - "required": false - }, - "carrier_technology": { - "type": "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology", - "description": "Specifies the carrier technology of the event handler (such as REST/Web Socket/Kafka)", - "required": true - }, - "event_protocol": { - "type": "onap.datatypes.policies.controlloop.operational.apex.EventProtocol", - "description": "Specifies the event protocol of events for the event handler (such as Yaml/JSON/XML/POJO)", - "required": true - }, - "event_name": { - "type": "string", - "description": "Specifies the event name for events on this event handler, if not specified, the event name is read from or written to the event being received or sent", - "required": false - }, - "event_name_filter": { - "type": "string", - "description": "Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through", - "required": false - }, - "synchronous_mode": { - "type": "boolean", - "description": "Specifies the event handler is syncronous (receive event and send response)", - "required": false, - "default": false - }, - "synchronous_peer": { - "type": "string", - "description": "The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode", - "required": false - }, - "synchronous_timeout": { - "type": "integer", - "description": "The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode", - "required": false - }, - "requestor_mode": { - "type": "boolean", - "description": "Specifies the event handler is in requestor mode (send event and wait for response mode)", - "required": false, - "default": false - }, - "requestor_peer": { - "type": "string", - "description": "The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode", - "required": false - }, - "requestor_timeout": { - "type": "integer", - "description": "The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.CarrierTechnology": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "label": { - "type": "string", - "description": "The label (name) of the carrier technology (such as REST, Kafka, WebSocket)", - "required": true - }, - "plugin_parameter_class_name": { - "type": "string", - "description": "The class name of the class that overrides default handling of event input or output for this carrier technology, defaults to the supplied input or output class", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.EventProtocol": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "label": { - "type": "string", - "description": "The label (name) of the event protocol (such as Yaml, JSON, XML, or POJO)", - "required": true - }, - "event_protocol_plugin_class": { - "type": "string", - "description": "The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.Environment": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "The name of the environment variable", - "required": true - }, - "value": { - "type": "string", - "description": "The value of the environment variable", - "required": true - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.engineservice.Engine": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "context": { - "type": "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context", - "description": "The properties for handling context in APEX engines, defaults to using Java maps for context", - "required": false - }, - "executors": { - "type": "map", - "description": "The plugins for policy executors used in engines such as javascript, MVEL, Jython", - "required": true, - "entry_schema": { - "description": "The plugin class path for this policy executor", - "type": "string" - } - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.engineservice.engine.Context": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "distributor": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for distributing context between APEX PDPs at runtime", - "required": false - }, - "schemas": { - "type": "map", - "description": "The plugins for context schemas available in APEX PDPs such as Java and Avro", - "required": false, - "entry_schema": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin" - } - }, - "locking": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for locking context in and between APEX PDPs at runtime", - "required": false - }, - "persistence": { - "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin", - "description": "The plugin to be used for persisting context for APEX PDPs at runtime", - "required": false - } - } - }, - "onap.datatypes.policies.controlloop.operational.apex.Plugin": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "name": { - "type": "string", - "description": "The name of the executor such as Javascript, Jython or MVEL", - "required": true - }, - "plugin_class_name": { - "type": "string", - "description": "The class path of the plugin class for this executor" - } - } - } - } -} - - = - - - - ${API_HOST} - ${API_PORT} - https - - policy/api/v1/policytypes - POST - true - false - true - false - - - - - - - - 200 - - - Assertion.response_code - false - 1 - - - true @@ -420,7 +114,7 @@ "policies": [ { "operational.apex.stabilityTestDefaultDomain": { - "type": "onap.policies.controlloop.operational.Apex", + "type": "onap.policies.controlloop.operational.common.Apex", "type_version": "1.0.0", "version": "1.0.0", "metadata": { @@ -7862,7 +7556,7 @@ ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies + /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/policies POST true false @@ -7896,7 +7590,7 @@ "policies": [ { "operational.apex.stabilityTestSampleDomain": { - "type": "onap.policies.controlloop.operational.Apex", + "type": "onap.policies.controlloop.operational.common.Apex", "type_version": "1.0.0", "version": "1.0.0", "metadata": { @@ -15338,7 +15032,7 @@ ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies + /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/policies POST true false @@ -15369,7 +15063,7 @@ 1 1 - true + false 600 true @@ -15547,7 +15241,6 @@ if (prev.getResponseCode() == '200') { true import groovy.json.JsonSlurper; - def res = []; if (prev.getResponseCode() == '200') { def jsonSlurper = new JsonSlurper(); @@ -15620,11 +15313,11 @@ if (prev.getResponseCode() == '200') { "pdpSubgroups": [ { "pdpType": "apex", - "desiredInstanceCount": 2, + "desiredInstanceCount": 1, "properties": {}, "supportedPolicyTypes": [ { - "name": "onap.policies.controlloop.operational.Apex", + "name": "onap.policies.controlloop.operational.common.Apex", "version": "1.0.0" } ], @@ -15665,30 +15358,6 @@ if (prev.getResponseCode() == '200') { - - false - 0 - ${DIR}pdp_sim_startup.sh - - - - - ${CONFIG_DIR} - = - - - - - - - ${DIR} - - - - 5000 - - - @@ -15733,34 +15402,33 @@ if (prev.getResponseCode() == '200') { assert res instanceof Map; assert res.groups.size == 2; - - for(int groupSize=0;groupSize<res.groups.size;groupSize++){ - - - for(int subGrpSize=0;subGrpSize<res.groups.pdpSubgroups.size;subGrpSize++){ - def pdpSubGrp=res.groups[0].pdpSubgroups; - - for(int supportedPolicyTypesSize=0;supportedPolicyTypesSize<pdpSubGrp[subGrpSize].supportedPolicyTypes.size;supportedPolicyTypesSize++){ - - if(pdpSubGrp[subGrpSize].supportedPolicyTypes[supportedPolicyTypesSize].name =='onap.policies.controlloop.operational.Apex'){ + for(int groupSize=0;groupSize<res.groups.size;groupSize++){ - assert pdpSubGrp[subGrpSize].pdpInstances.size > 0; - if (res.groups[0].name == 'defaultGroup') - assert pdpSubGrp[subGrpSize].policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; - }else if(res.groups[0].name == 'sampleGroup' ){ - assert pdpSubGrp[subGrpSize].policies.size == 0; - + for(int subGrpSize=0;subGrpSize<res.groups[groupSize].pdpSubgroups.size;subGrpSize++){ + + def pdpSubGrp=res.groups[groupSize].pdpSubgroups[subGrpSize]; + for(int supportedPolicyTypesSize=0;supportedPolicyTypesSize<pdpSubGrp.supportedPolicyTypes.size;supportedPolicyTypesSize++){ + if(pdpSubGrp.supportedPolicyTypes[supportedPolicyTypesSize].name =='onap.policies.controlloop.operational.common.Apex'){ + assert pdpSubGrp.pdpInstances.size > 0; + if (res.groups[groupSize].name == 'defaultGroup') { + assert pdpSubGrp.policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; + } + else if(res.groups[groupSize].name == 'sampleGroup' ){ + assert pdpSubGrp.policies.size == 0; + } } - } } - } } + + 120000 + + true @@ -15817,10 +15485,6 @@ if (prev.getResponseCode() == '200') { - - 500 - - @@ -15865,27 +15529,72 @@ if (prev.getResponseCode() == '200') { assert res instanceof Map; assert res.groups.size == 2; - for(int groupSize=0;groupSize<res.groups.size;groupSize++){ - for(int subGrpSize=0;subGrpSize<res.groups.pdpSubgroups.size;subGrpSize++){ + for(int groupSize=0;groupSize<res.groups.size;groupSize++){ - def pdpSubGrp=res.groups[0].pdpSubgroups; - - for(int supportedPolicyTypesSize=0;supportedPolicyTypesSize<pdpSubGrp[subGrpSize].supportedPolicyTypes.size;supportedPolicyTypesSize++){ - - if(pdpSubGrp[subGrpSize].supportedPolicyTypes[supportedPolicyTypesSize].name =='onap.policies.controlloop.operational.Apex'){ + for(int subGrpSize=0;subGrpSize<res.groups[groupSize].pdpSubgroups.size;subGrpSize++){ - if (res.groups[0].name == 'defaultGroup') - assert pdpSubGrp[subGrpSize].policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; - }else if(res.groups[0].name == 'sampleGroup' ){ - assert pdpSubGrp[subGrpSize].policies[0].name == 'operational.apex.stabilityTestSampleDomain'; + def pdpSubGrp=res.groups[groupSize].pdpSubgroups[subGrpSize]; + for(int supportedPolicyTypesSize=0;supportedPolicyTypesSize<pdpSubGrp.supportedPolicyTypes.size;supportedPolicyTypesSize++){ + if(pdpSubGrp.supportedPolicyTypes[supportedPolicyTypesSize].name =='onap.policies.controlloop.operational.common.Apex'){ + if (res.groups[groupSize].name == 'defaultGroup') { + assert pdpSubGrp.policies[0].name == 'operational.apex.stabilityTestDefaultDomain'; + }else if(res.groups[groupSize].name == 'sampleGroup' ){ + assert pdpSubGrp.policies[0].name == 'operational.apex.stabilityTestSampleDomain'; } - + } } } - } } + + + + + + + + + ${PAP_HOST} + ${PAP_PORT} + https + + /policy/pap/v1/components/healthcheck + GET + true + false + true + false + + + + Consolidated Health Check + + + + + 200 + + + Assertion.response_code + false + 1 + + + + groovy + + + true + import groovy.json.JsonSlurper; + +def res = []; +if (prev.getResponseCode() == '200') { + def jsonSlurper = new JsonSlurper(); + res = jsonSlurper.parseText(prev.getResponseDataAsString()); + assert res instanceof Map; + assert res.healthy==true; +} @@ -15938,23 +15647,6 @@ if (prev.getResponseCode() == '200') { - - false - 0 - ${DIR}pdp_sim_stop.sh - - - - - - - ${DIR} - - - - 500 - - true @@ -16100,25 +15792,6 @@ if (prev.getResponseCode() == '200') { 1 - - groovy - - - true - import groovy.json.JsonSlurper; - -def res = []; -if (prev.getResponseCode() == '200') { - def jsonSlurper = new JsonSlurper(); - res = jsonSlurper.parseText(prev.getResponseDataAsString()); - - assert res instanceof Map; - assert res.groups.size > 0; - assert res.groups[0].pdpGroupState== 'PASSIVE'; -} - - - @@ -16254,7 +15927,7 @@ if (prev.getResponseCode() == '200') { ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies/operational.apex.stabilityTestDefaultDomain/versions/1.0.0 + /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/policies/operational.apex.stabilityTestDefaultDomain/versions/1.0.0 DELETE true false @@ -16284,37 +15957,7 @@ if (prev.getResponseCode() == '200') { ${API_PORT} https - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0/policies/operational.apex.stabilityTestSampleDomain/versions/1.0.0 - DELETE - true - false - true - false - - - - - - - - 200 - - - Assertion.response_code - false - 1 - - - - - - - - ${API_HOST} - ${API_PORT} - https - - /policy/api/v1/policytypes/onap.policies.controlloop.operational.Apex/versions/1.0.0 + /policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0/policies/operational.apex.stabilityTestSampleDomain/versions/1.0.0 DELETE true false @@ -16371,7 +16014,7 @@ if (prev.getResponseCode() == '200') { true - /home/adityap/pap_stability/summary.log + /home/ubuntu/pap_stability/summary.log @@ -16408,7 +16051,7 @@ if (prev.getResponseCode() == '200') { true - /home/adityap/pap_stability/resultTable.log + /home/ubuntu/pap_stability/resultTree.log @@ -16445,7 +16088,7 @@ if (prev.getResponseCode() == '200') { true - /home/adityap/pap_stability/resultTree.log + /home/ubuntu/pap_stability/resultTable.log