From 616e366adfff4ca35fb194cead8ab1de800ef35b Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Thu, 13 May 2021 15:32:12 -0400 Subject: Remove csit folder from policy/xacml-pdp The csit test files for all repos have been consolidated in policy/docker to maintain them at single place and allow us to trigger verify jobs in gerrit reviews. Issue-ID: POLICY-3257 Change-Id: I54e93a2b43de0e4b36ac74a5cd94eda741bad5fa Signed-off-by: Ram Krishna Verma (cherry picked from commit 7293cbd3c0bf0043b663d036dcb7abe400a4e706) --- csit/plans/setup.sh | 57 -------- csit/plans/teardown.sh | 20 --- csit/plans/testplan.txt | 3 - .../data/onap.policy.guard.decision.request.json | 16 --- .../onap.policy.monitoring.decision.request.json | 9 -- .../data/onap.policy.naming.decision.request.json | 13 -- .../onap.policy.optimization.decision.request.json | 15 -- .../tests/data/vCPE.policy.input.tosca.deploy.json | 5 - csit/tests/xacml-pdp-test.robot | 159 --------------------- 9 files changed, 297 deletions(-) delete mode 100644 csit/plans/setup.sh delete mode 100644 csit/plans/teardown.sh delete mode 100644 csit/plans/testplan.txt delete mode 100644 csit/tests/data/onap.policy.guard.decision.request.json delete mode 100644 csit/tests/data/onap.policy.monitoring.decision.request.json delete mode 100644 csit/tests/data/onap.policy.naming.decision.request.json delete mode 100644 csit/tests/data/onap.policy.optimization.decision.request.json delete mode 100644 csit/tests/data/vCPE.policy.input.tosca.deploy.json delete mode 100644 csit/tests/xacml-pdp-test.robot diff --git a/csit/plans/setup.sh b/csit/plans/setup.sh deleted file mode 100644 index 21d88213..00000000 --- a/csit/plans/setup.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# Copyright (C) 2020-2021 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= -source ${SCRIPTS}/get-branch-mariadb.sh - -echo "Uninstall docker-py and reinstall docker." -pip uninstall -y docker-py -pip uninstall -y docker -pip install -U docker==2.7.0 - -sudo apt-get -y install libxml2-utils -bash ${SCRIPTS}/get-models-examples.sh - -source ${SCRIPTS}/detmVers.sh - -docker-compose -f ${SCRIPTS}/docker-compose-all.yml up -d xacml-pdp - -unset http_proxy https_proxy - -POLICY_API_IP=`get-instance-ip.sh policy-api` -MARIADB_IP=`get-instance-ip.sh mariadb` -POLICY_PDPX_IP=`get-instance-ip.sh policy-xacml-pdp` -SIM_IP=`get-instance-ip.sh policy.api.simpledemo.onap.org` -POLICY_PAP_IP=`get-instance-ip.sh policy-pap` - -echo PDP IP IS ${POLICY_PDPX_IP} -echo API IP IS ${POLICY_API_IP} -echo PAP IP IS ${POLICY_PAP_IP} -echo MARIADB IP IS ${MARIADB_IP} -echo SIM_IP IS ${SIM_IP} - -# wait for the app to start up -${SCRIPTS}/wait_for_port.sh ${POLICY_PDPX_IP} 6969 - -DATA2=${WORKSPACE}/models/models-examples/src/main/resources/policies - -ROBOT_VARIABLES="" -ROBOT_VARIABLES="${ROBOT_VARIABLES} -v SCR_DMAAP:${SCRIPTS}" -ROBOT_VARIABLES="${ROBOT_VARIABLES} -v DATA2:${DATA2}" -ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PDPX_IP:${POLICY_PDPX_IP}" -ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_API_IP:${POLICY_API_IP}" -ROBOT_VARIABLES="${ROBOT_VARIABLES} -v POLICY_PAP_IP:${POLICY_PAP_IP}" diff --git a/csit/plans/teardown.sh b/csit/plans/teardown.sh deleted file mode 100644 index e101973f..00000000 --- a/csit/plans/teardown.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# ============LICENSE_START======================================================= -# Copyright (C) 2019-2021 AT&T Intellectual Property. 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. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# SPDX-License-Identifier: Apache-2.0 -# ============LICENSE_END========================================================= - -docker-compose -f ${SCRIPTS}/docker-compose-all.yml down -v diff --git a/csit/plans/testplan.txt b/csit/plans/testplan.txt deleted file mode 100644 index b24929f4..00000000 --- a/csit/plans/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [policy/xacml-pdp.git]/tests/. -# Place the suites in run order. -xacml-pdp-test.robot diff --git a/csit/tests/data/onap.policy.guard.decision.request.json b/csit/tests/data/onap.policy.guard.decision.request.json deleted file mode 100644 index ee90feaa..00000000 --- a/csit/tests/data/onap.policy.guard.decision.request.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "ONAPName": "Guard", - "ONAPComponent": "Guard-component", - "ONAPInstance": "Guard-component-instance", - "requestId": "unique-request-guard-1", - "action": "guard", - "resource": { - "guard": { - "actor": "APPC", - "operation": "ModifyConfig", - "target": "f17face5-69cb-4c88-9e0b-7426db7edddd", - "requestId": "c7c6a4aa-bb61-4a15-b831-ba1472dd4a65", - "clname": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a" - } - } -} diff --git a/csit/tests/data/onap.policy.monitoring.decision.request.json b/csit/tests/data/onap.policy.monitoring.decision.request.json deleted file mode 100644 index f79f4eb6..00000000 --- a/csit/tests/data/onap.policy.monitoring.decision.request.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ONAPName": "DCAE", - "ONAPComponent": "PolicyHandler", - "ONAPInstance": "622431a4-9dea-4eae-b443-3b2164639c64", - "action": "configure", - "resource": { - "policy-id": "onap.restart.tca" - } -} \ No newline at end of file diff --git a/csit/tests/data/onap.policy.naming.decision.request.json b/csit/tests/data/onap.policy.naming.decision.request.json deleted file mode 100644 index 3833a241..00000000 --- a/csit/tests/data/onap.policy.naming.decision.request.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ONAPName": "SDNC", - "ONAPComponent": "SDNC-component", - "ONAPInstance": "SDNC-component-instance", - "requestId": "unique-request-sdnc-1", - "action": "naming", - "resource": { - "nfRole": [], - "naming-type": [], - "property-name": [], - "policy-type": ["onap.policies.Naming"] - } -} diff --git a/csit/tests/data/onap.policy.optimization.decision.request.json b/csit/tests/data/onap.policy.optimization.decision.request.json deleted file mode 100644 index d997099c..00000000 --- a/csit/tests/data/onap.policy.optimization.decision.request.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "ONAPName": "OOF", - "ONAPComponent": "OOF-component", - "ONAPInstance": "OOF-component-instance", - "context" : { - "subscriberName": [] - }, - "action": "optimize", - "resource": { - "scope": [], - "services": [], - "resources": [], - "geography": [] - } -} diff --git a/csit/tests/data/vCPE.policy.input.tosca.deploy.json b/csit/tests/data/vCPE.policy.input.tosca.deploy.json deleted file mode 100644 index 7ace047b..00000000 --- a/csit/tests/data/vCPE.policy.input.tosca.deploy.json +++ /dev/null @@ -1,5 +0,0 @@ -{"policies":[ - {"policy-id":"onap.restart.tca"}, - {"policy-id":"OSDF_CASABLANCA.Affinity_Default"} - ] -} diff --git a/csit/tests/xacml-pdp-test.robot b/csit/tests/xacml-pdp-test.robot deleted file mode 100644 index 97c4cb30..00000000 --- a/csit/tests/xacml-pdp-test.robot +++ /dev/null @@ -1,159 +0,0 @@ -*** Settings *** -Library Collections -Library RequestsLibrary -Library OperatingSystem -Library Process -Library json - -*** Test Cases *** -Healthcheck - [Documentation] Verify policy xacml-pdp health check - ${resp}= PeformGetRequest /policy/pdpx/v1/healthcheck 200 - Should Be Equal As Strings ${resp.json()['code']} 200 - -Statistics - [Documentation] Verify policy xacml-pdp statistics - ${resp}= PeformGetRequest /policy/pdpx/v1/statistics 200 - Should Be Equal As Strings ${resp.json()['code']} 200 - -MakeTopics - [Documentation] Creates the Policy topics - ${result}= Run Process ${SCR_DMAAP}/make_topic.sh POLICY-PDP-PAP - Should Be Equal As Integers ${result.rc} 0 - -ExecuteXacmlPolicy - Wait Until Keyword Succeeds 1 min 15 sec CreateMonitorPolicy - Wait Until Keyword Succeeds 1 min 15 sec CreateOptimizationPolicy - Wait Until Keyword Succeeds 1 min 15 sec GetDefaultDecision - Wait Until Keyword Succeeds 1 min 15 sec DeployPolicies - Wait Until Keyword Succeeds 1 min 15 sec GetStatisticsAfterDeployed - Wait Until Keyword Succeeds 1 min 15 sec GetAbbreviatedDecisionResult - Wait Until Keyword Succeeds 1 min 15 sec GetMonitoringDecision - Wait Until Keyword Succeeds 1 min 15 sec GetNamingDecision - Wait Until Keyword Succeeds 1 min 15 sec GetOptimizationDecision - Wait Until Keyword Succeeds 1 min 15 sec GetStatisticsAfterDecision - Wait Until Keyword Succeeds 1 min 15 sec UndeployMonitorPolicy - Wait Until Keyword Succeeds 1 min 15 sec GetStatisticsAfterUndeploy - -*** Keywords *** - -CreateMonitorPolicy - [Documentation] Create a Monitoring policy - CreatePolicy /policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies 200 vCPE.policy.monitoring.input.tosca.json onap.restart.tca 1.0.0 - -CreateOptimizationPolicy - [Documentation] Create an Optimization policy - CreatePolicy /policy/api/v1/policytypes/onap.policies.optimization.resource.AffinityPolicy/versions/1.0.0/policies 200 vCPE.policies.optimization.input.tosca.json OSDF_CASABLANCA.Affinity_Default 1.0.0 - -GetDefaultDecision - [Documentation] Get Default Decision with no policies in Xacml PDP - ${resp}= PerformPostRequest /policy/pdpx/v1/decision abbrev=true ${POLICY_PDPX_IP} 200 onap.policy.guard.decision.request.json ${CURDIR}/data - ${status}= Get From Dictionary ${resp.json()} status - Should Be Equal As Strings ${status} Permit - -DeployPolicies - [Documentation] Runs Policy PAP to deploy a policy - ${resp}= PerformPostRequest /policy/pap/v1/pdps/policies null ${POLICY_PAP_IP} 202 vCPE.policy.input.tosca.deploy.json ${CURDIR}/data - Sleep 5s - ${result}= Run Process ${SCR_DMAAP}/wait_topic.sh POLICY-PDP-PAP - ... responseTo xacml ACTIVE onap.restart.tca - -GetStatisticsAfterDeployed - [Documentation] Verify policy xacml-pdp statistics after policy is deployed - ${resp}= PeformGetRequest /policy/pdpx/v1/statistics 200 - Should Be Equal As Strings ${resp.json()['code']} 200 - Should Be Equal As Strings ${resp.json()['totalPoliciesCount']} 3 - -GetAbbreviatedDecisionResult - [Documentation] Get Decision with abbreviated results from Policy Xacml PDP - ${resp}= PerformPostRequest /policy/pdpx/v1/decision abbrev=true ${POLICY_PDPX_IP} 200 onap.policy.monitoring.decision.request.json ${CURDIR}/data - ${policy}= Get From Dictionary ${resp.json()['policies']} onap.restart.tca - Dictionary Should Contain Key ${policy} type - Dictionary Should Contain Key ${policy} metadata - Dictionary Should Not Contain Key ${policy} type_version - Dictionary Should Not Contain Key ${policy} properties - Dictionary Should Not Contain Key ${policy} name - Dictionary Should Not Contain Key ${policy} version - -GetMonitoringDecision - [Documentation] Get Decision from Monitoring Policy Xacml PDP - ${resp}= PerformPostRequest /policy/pdpx/v1/decision null ${POLICY_PDPX_IP} 200 onap.policy.monitoring.decision.request.json ${CURDIR}/data - ${policy}= Get From Dictionary ${resp.json()['policies']} onap.restart.tca - Dictionary Should Contain Key ${policy} type - Dictionary Should Contain Key ${policy} metadata - Dictionary Should Contain Key ${policy} type_version - Dictionary Should Contain Key ${policy} properties - Dictionary Should Contain Key ${policy} name - Dictionary Should Contain Key ${policy} version - -GetNamingDecision - [Documentation] Get Decision from Naming Policy Xacml PDP - ${resp}= PerformPostRequest /policy/pdpx/v1/decision null ${POLICY_PDPX_IP} 200 onap.policy.naming.decision.request.json ${CURDIR}/data - ${policy}= Get From Dictionary ${resp.json()['policies']} SDNC_Policy.ONAP_NF_NAMING_TIMESTAMP - Dictionary Should Contain Key ${policy} type - Dictionary Should Contain Key ${policy} type_version - Dictionary Should Contain Key ${policy} properties - Dictionary Should Contain Key ${policy} name - -GetOptimizationDecision - [Documentation] Get Decision from Optimization Policy Xacml PDP - ${resp}= PerformPostRequest /policy/pdpx/v1/decision null ${POLICY_PDPX_IP} 200 onap.policy.optimization.decision.request.json ${CURDIR}/data - ${policy}= Get From Dictionary ${resp.json()['policies']} OSDF_CASABLANCA.Affinity_Default - Dictionary Should Contain Key ${policy} type - Dictionary Should Contain Key ${policy} type_version - Dictionary Should Contain Key ${policy} properties - Dictionary Should Contain Key ${policy} name - -GetStatisticsAfterDecision - [Documentation] Runs Policy Xacml PDP Statistics after Decision request - ${resp}= PeformGetRequest /policy/pdpx/v1/statistics 200 - Should Be Equal As Strings ${resp.json()['code']} 200 - Should Be Equal As Strings ${resp.json()['permitDecisionsCount']} 4 - Should Be Equal As Strings ${resp.json()['notApplicableDecisionsCount']} 1 - -UndeployMonitorPolicy - [Documentation] Runs Policy PAP to undeploy a policy - PeformDeleteRequest /policy/pap/v1/pdps/policies/onap.restart.tca 202 - -GetStatisticsAfterUndeploy - [Documentation] Runs Policy Xacml PDP Statistics after policy is undeployed - ${resp}= PeformGetRequest /policy/pdpx/v1/statistics 200 - Should Be Equal As Strings ${resp.json()['code']} 200 - Should Be Equal As Strings ${resp.json()['totalPoliciesCount']} 2 - -CreatePolicy - [Arguments] ${url} ${expectedstatus} ${jsonfile} ${policyname} ${policyversion} - [Documentation] Create the specific policy - ${resp}= PerformPostRequest ${url} null ${POLICY_API_IP} ${expectedstatus} ${jsonfile} ${DATA2} - Run Keyword If ${expectedstatus}==200 Dictionary Should Contain Key ${resp.json()['topology_template']['policies'][0]} ${policyname} - Run Keyword If ${expectedstatus}==200 Should Be Equal As Strings ${resp.json()['topology_template']['policies'][0]['${policyname}']['version']} ${policyversion} - -PerformPostRequest - [Arguments] ${url} ${params} ${hostname} ${expectedstatus} ${jsonfile} ${filepath} - ${auth}= Create List healthcheck zb!XztG34 - ${postjson}= Get file ${filepath}/${jsonfile} - Log Creating session https://${hostname}:6969 - ${session}= Create Session policy https://${hostname}:6969 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= POST On Session policy ${url} params=${params} data=${postjson} headers=${headers} expected_status=${expectedstatus} - Log Received response from policy ${resp.text} - [return] ${resp} - -PeformGetRequest - [Arguments] ${url} ${expectedstatus} - ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_PDPX_IP}:6969 - ${session}= Create Session policy https://${POLICY_PDPX_IP}:6969 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= GET On Session policy ${url} headers=${headers} expected_status=${expectedstatus} - Log Received response from policy ${resp.text} - [return] ${resp} - -PeformDeleteRequest - [Arguments] ${url} ${expectedstatus} - ${auth}= Create List healthcheck zb!XztG34 - Log Creating session https://${POLICY_PAP_IP}:6969 - ${session}= Create Session policy https://${POLICY_PAP_IP}:6969 auth=${auth} - ${headers}= Create Dictionary Accept=application/json Content-Type=application/json - ${resp}= DELETE On Session policy ${url} headers=${headers} expected_status=${expectedstatus} - Log Received response from policy ${resp.text} -- cgit 1.2.3-korg