summaryrefslogtreecommitdiffstats
path: root/vid-automation
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2020-02-12 18:22:59 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-12 18:22:59 +0000
commitf3ae1b251eecdf18c2827eb03db23e10ad9ddb76 (patch)
tree231738b3b40b6ffec28fdbb433635ecbd052412b /vid-automation
parent9b2482888c7ac3da22ef9eb41ffc5b7ac864f672 (diff)
parentc2bfa8b1e903471f60fd5531c260ced8c9d1eb47 (diff)
Merge "Feature toggle for owning-entities filtering"
Diffstat (limited to 'vid-automation')
-rw-r--r--vid-automation/conf/users23
-rw-r--r--vid-automation/src/main/java/vid/automation/test/infra/Features.java1
2 files changed, 20 insertions, 4 deletions
diff --git a/vid-automation/conf/users b/vid-automation/conf/users
index de18c38d7..648b661a5 100644
--- a/vid-automation/conf/users
+++ b/vid-automation/conf/users
@@ -13,7 +13,10 @@
"userId": "1",
"password": "1"
},
- "roles": ["SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___DARREN MCGEE", "CAR_2020_ER___DARREN MCGEE", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA","READ___LOGS___PERMITTED","Emanuel___mySubType", "global-customer-id___service-instance-type"],
+ "roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___DARREN MCGEE", "CAR_2020_ER___DARREN MCGEE", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA","READ___LOGS___PERMITTED","Emanuel___mySubType", "global-customer-id___service-instance-type"
+ ],
"subscriberNames": ["SILVIA ROBBINS", "CAR_2020_ER", "Emanuel", "global-customer-id"],
"serviceTypes": ["TYLER SILVIA", "DARREN MCGEE", "MSO-dev-service-type"],
"tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
@@ -23,7 +26,10 @@
"userId": "3",
"password": "3"
},
- "roles": ["Emanuel___Emanuel"],
+ "roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "Emanuel___Emanuel"
+ ],
"subscriberNames": ["Emanuel"],
"serviceTypes": ["Emanuel"],
"tenants": ["c630e297a3ae486497d63eacec1d7c14", "d3b49834f7164cbe831bfbfa35ef649b"]
@@ -33,7 +39,10 @@
"userId": "667",
"password": "667"
},
- "roles": ["CRAIG/ROBERTS___AIM Transport"],
+ "roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "CRAIG/ROBERTS___AIM Transport"
+ ],
"subscriberNames": ["CRAIG/ROBERTS"],
"serviceTypes": ["AIM Transport"],
"tenants": null
@@ -43,7 +52,10 @@
"userId": "4",
"password": "4"
},
- "roles": ["Emanuel___vWINIFRED", "Emanuel___vRichardson"],
+ "roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "Emanuel___vWINIFRED", "Emanuel___vRichardson"
+ ],
"subscriberNames": ["Emanuel"],
"serviceTypes": ["vWINIFRED", "vRichardson"],
"tenants": ["092eb9e8e4b7412e8787dd091bc58e86"]
@@ -54,6 +66,7 @@
"password": "822"
},
"roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
"JULIO ERICKSON___Emanuel",
"JULIO ERICKSON___vRichardson"
@@ -68,6 +81,7 @@
"password": "312"
},
"roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___vRichardson"
],
"subscriberNames": ["Emanuel"],
@@ -80,6 +94,7 @@
"password": "312"
},
"roles": [
+ "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___vWINIFRED___test-hvf6-09"
],
"subscriberNames": ["Emanuel"],
diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
index ddf0baddb..ff06bf98e 100644
--- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
@@ -59,6 +59,7 @@ public enum Features implements Feature {
FLAG_2004_INSTANTIATION_TEMPLATES_POPUP,
FLAG_2006_VFM_SDNC_PRELOAD_FILES,
FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY,
+ FLAG_2006_LIMIT_OWNING_ENTITY_SELECTION_BY_ROLES,
FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF,
;