aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-02-13 16:44:01 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-13 16:44:01 +0000
commitceba0ec684ce49fba3ddc1c6229bfb63ca2c2cc5 (patch)
tree86c33757b7b5837c84e6117e1d7b711d14b7c9be
parent6bb3fad98f9ea0ccb3c5e4ad5621f3f66271ed3a (diff)
parentd582694d020cb01271297ebebc52c5eaa4330079 (diff)
Merge "Translate owning entity name to owning entity ID - update api test to except new behavior"
-rw-r--r--vid-app-common/src/test/java/org/onap/vid/roles/RoleProviderTest.java4
-rw-r--r--vid-automation/conf/users14
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java2
3 files changed, 9 insertions, 11 deletions
diff --git a/vid-app-common/src/test/java/org/onap/vid/roles/RoleProviderTest.java b/vid-app-common/src/test/java/org/onap/vid/roles/RoleProviderTest.java
index 5f4fc7861..ed7f82a45 100644
--- a/vid-app-common/src/test/java/org/onap/vid/roles/RoleProviderTest.java
+++ b/vid-app-common/src/test/java/org/onap/vid/roles/RoleProviderTest.java
@@ -201,9 +201,7 @@ public class RoleProviderTest {
private String owningEntityId() {
- // while translateOwningEntityNameToOwningEntityId does nothing, no translation happens.
- // this will be changed later.
- return SAMPLE_SUBSCRIBER;
+ return EXISTING_OWNING_ENTITY_ID;
}
private void setSubscribers() {
diff --git a/vid-automation/conf/users b/vid-automation/conf/users
index 648b661a5..8f38018b8 100644
--- a/vid-automation/conf/users
+++ b/vid-automation/conf/users
@@ -14,7 +14,7 @@
"password": "1"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___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"],
@@ -27,7 +27,7 @@
"password": "3"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___Emanuel"
],
"subscriberNames": ["Emanuel"],
@@ -40,7 +40,7 @@
"password": "667"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"CRAIG/ROBERTS___AIM Transport"
],
"subscriberNames": ["CRAIG/ROBERTS"],
@@ -53,7 +53,7 @@
"password": "4"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___vWINIFRED", "Emanuel___vRichardson"
],
"subscriberNames": ["Emanuel"],
@@ -66,7 +66,7 @@
"password": "822"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"JULIO ERICKSON___Emanuel",
"JULIO ERICKSON___vRichardson"
@@ -81,7 +81,7 @@
"password": "312"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___vRichardson"
],
"subscriberNames": ["Emanuel"],
@@ -94,7 +94,7 @@
"password": "312"
},
"roles": [
- "d61e6f2d-12fa-4cc2-91df-7c244011d6fc___LOB", "Melissa___LOB", "aaa1___LOB",
+ "WayneHolland___LOB", "Melissa___LOB", "aaa1___LOB",
"Emanuel___vWINIFRED___test-hvf6-09"
],
"subscriberNames": ["Emanuel"],
diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
index 54300c22a..958ba87d1 100644
--- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
@@ -907,7 +907,7 @@ public class AaiApiTest extends BaseApiAaiTest {
public void searchServiceInstancesBySubscriber_serviceInstanceOfAnotherSubscriber_authIsFollowingFeatureToggle() {
String craigRobertsSubscriberId = "31739f3e-526b-11e6-beb8-9e71128cae77";
String aServiceOwningEntityId = "f160c875-ddd1-4ef5-84d8-d098784daa3a";
- String currentUserAuthorizedOwningEntityId = "SILVIA ROBBINS"; // this will need to change with translateOwningEntityNameToOwningEntityId
+ String currentUserAuthorizedOwningEntityId = "d61e6f2d-12fa-4cc2-91df-7c244011d6fc";
SimulatorApi.registerExpectation(GET_SUBSCRIBERS_FOR_CUSTOMER_CRAIG_ROBERTS,
ImmutableMap.of(aServiceOwningEntityId, currentUserAuthorizedOwningEntityId), CLEAR_THEN_SET);