From cba1e13c6b483fa97236e0a560fad0074fbfd851 Mon Sep 17 00:00:00 2001 From: tierno Date: Fri, 5 Jun 2020 15:11:04 +0200 Subject: [PATCH] fix basic test 17 project quotas Signed-off-by: tierno --- 02-osm-nfvi-test-plan.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/02-osm-nfvi-test-plan.md b/02-osm-nfvi-test-plan.md index 82da4b9..f9ec0e7 100644 --- a/02-osm-nfvi-test-plan.md +++ b/02-osm-nfvi-test-plan.md @@ -399,15 +399,15 @@ This test will check project creation edition and isolation. It tests the quotas 1. Create project with quotas. Tests `osmclient` with both comma-separated list and repetition of `--quotas` option: ```bash - osm project-create p3 --quotas vnfds=1,nsds=1 --quotas nsrs=1 + osm project-create p3 --quotas vnfds=1,nsds=1 --quotas ns_instances=1 osm project-show p3 | grep -q -e '"vnfds": 1' || echo "FAIL" osm project-show p3 | grep -q -e '"nsds": 1' || echo "FAIL" - osm project-show p3 | grep -q -e '"nsds": 1' || echo "FAIL" + osm project-show p3 | grep -q -e '"ns_instances": 1' || echo "FAIL" - osm project-create p2 --quotas vnfds=1,nsds=1,nsrs=1 + osm project-create p2 --quotas vnfds=1,nsds=1,ns_instances=1 osm project-show p2 | grep -q -e '"vnfds": 1' || echo "FAIL" osm project-show p2 | grep -q -e '"nsds": 1' || echo "FAIL" - osm project-show p2 | grep -q -e '"nsds": 1' || echo "FAIL" + osm project-show p2 | grep -q -e '"ns_instances": 1' || echo "FAIL" ``` 2. Create user and assign both projecst with `project_admin` role: ```bash @@ -418,7 +418,7 @@ This test will check project creation edition and isolation. It tests the quotas osm project-update p3 --name p1 osm project-show p1 | grep -q -e '"vnfds": 1' || echo "FAIL" osm project-show p1 | grep -q -e '"nsds": 1' || echo "FAIL" - osm project-show p1 | grep -q -e '"nsds": 1' || echo "FAIL" + osm project-show p1 | grep -q -e '"ns_instances": 1' || echo "FAIL" osm user-show u | grep -q -e '"p3"' && echo "FAIL" # user uses renamed project 'p1', not 'p3' ``` 4. List packages (list must be empty) without any uuid. Using regular expression for grep: @@ -435,7 +435,7 @@ This test will check project creation edition and isolation. It tests the quotas ``` 7. Enlarge quota: ```bash - osm project-update p1 --quotas "vnfds=10,nsds=,nsrs=" + osm project-update p1 --quotas "vnfds=10,nsds=,ns_instances=" osm project-show p1 | grep -q -e '"vnfds": 10' || echo "FAIL" osm project-show p1 | grep -q -e '"nsds":' && echo "FAIL" ``` @@ -453,16 +453,16 @@ This test will check project creation edition and isolation. It tests the quotas ```bash osm --project p2 --password u --user u vnfpkg-list | grep -q -E "[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}" && echo "FAIL" ``` -11. Test quota +11. Test quota in project 2. Only one package is allowed ```bash osm --project p2 --password u --user u vnfpkg-create hackfest_basic_vnf.tar.gz --override "id=vp2_1;name=vp2_1" osm --project p2 --password u --user u vnfpkg-create hackfest_basic_vnf.tar.gz --override "id=vp2_2;name=vp2_2" && echo "FAIL" ``` -12. Check that one project cannot see the scope of other: +12. Check that one project cannot see the scope of other projects: ```bash - osm --project p2 --password u --user u --all-projects vnfpkg-list && echo "FAIL" - osm --project p1 --password u --user u --all-projects vnfpkg-show vp2_1 && echo "FAIL" - osm --project p2 --password u --user u --all-projects vnfpkg-show v1 && echo "FAIL" + osm --project p2 --password u --user u --all-projects vnfpkg-list && echo "FAIL" # not authorized + osm --project p1 --password u --user u vnfpkg-show vp2_1 && echo "FAIL" + osm --project p2 --password u --user u vnfpkg-show v1 && echo "FAIL" ``` 13. Delete. Test dependencies: 1. Remove packages @@ -470,7 +470,7 @@ This test will check project creation edition and isolation. It tests the quotas for i in {1..10} ; do osm --project p1 --password u --user u vnfpkg-delete v${i} done - osm --project p2 --password u --user u vnfpkg-delete v1p2_1 + osm --project p2 --password u --user u vnfpkg-delete vp2_1 ``` 2. Delete project will fail because in use by user 'u' ```bash -- GitLab