Translate owning entity name to owning entity ID - update api test to except new...

Issue-ID: VID-758
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: Ib8b8da5c3267a3668cf29b950233af14b29f2d23

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 5f4fc78..ed7f82a 100644 (file)
--- 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 648b661..8f38018 100644 (file)
--- 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 54300c2..958ba87 100644 (file)
--- 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);