Merge "Rename Onap A1 client"

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java
new file mode 100644 (file)
index 0000000..466e579
--- /dev/null
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/DashboardUserManagerTest.java
@@ -0,0 +1,83 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ * %%
+ * Copyright (C) 2019 AT&T Intellectual Property
+ * %%
+ * 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.
+ * ========================LICENSE_END===================================
+ */
+package org.oransc.ric.portal.dashboard;
+
+import java.lang.invoke.MethodHandles;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
+import org.onap.portalsdk.core.restful.domain.EcompRole;
+import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.test.context.ActiveProfiles;
+
+@ActiveProfiles("test")
+public class DashboardUserManagerTest {
+
+    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    public static EcompUser createEcompUser(String loginId) {
+        EcompUser user = new EcompUser();
+        user.setActive(true);
+        user.setLoginId(loginId);
+        user.setFirstName("First");
+        user.setLastName("Last");
+        EcompRole role = new EcompRole();
+        role.setId(1L);
+        role.setName(DashboardConstants.ROLE_NAME_ADMIN);
+        Set<EcompRole> roles = new HashSet<>();
+        roles.add(role);
+        user.setRoles(roles);
+        return user;
+    }
+
+    @Test
+    public void testUserMgr() throws Exception {
+        final String loginId = "demo";
+        DashboardUserManager dum = new DashboardUserManager(true);
+        EcompUser user = createEcompUser(loginId);
+        dum.createUser(user);
+        logger.info("Created user {}", user);
+        try {
+            dum.createUser(user);
+            throw new Exception("Unexpected success");
+        } catch (PortalAPIException ex) {
+            logger.info("caught expected exception: {}", ex.toString());
+        }
+        Assert.assertFalse(dum.getUsers().isEmpty());
+        EcompUser fetched = dum.getUser(loginId);
+        Assert.assertEquals(fetched, user);
+        fetched.setLastName("Lastier");
+        dum.updateUser(loginId, fetched);
+        EcompUser missing = dum.getUser("foo");
+        Assert.assertNull(missing);
+        EcompUser unk = createEcompUser("unknown");
+        try {
+            dum.updateUser("unk", unk);
+        } catch (PortalAPIException ex) {
+            logger.info("caught expected exception: {}", ex.toString());
+        }
+    }
+
+}

diff --git a/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManagerTest.java b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManagerTest.java
new file mode 100644 (file)
index 0000000..050fbf0
--- /dev/null
+++ b/dashboard/webapp-backend/src/test/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManagerTest.java
@@ -0,0 +1,92 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ * %%
+ * Copyright (C) 2019 AT&T Intellectual Property
+ * %%
+ * 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.
+ * ========================LICENSE_END===================================
+ */
+package org.oransc.ric.portal.dashboard.portalapi;
+
+import java.io.IOException;
+import java.lang.invoke.MethodHandles;
+import java.lang.reflect.InvocationTargetException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+
+import org.junit.Assert;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
+import org.oransc.ric.portal.dashboard.DashboardUserManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
+@ActiveProfiles("test")
+public class PortalAuthManagerTest {
+
+    @Value("${portalapi.decryptor}")
+    private String decryptor;
+
+    private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+
+    @Test
+    public void testPortalStuff() throws ClassNotFoundException, InstantiationException, IllegalAccessException,
+        InvocationTargetException, NoSuchMethodException, IOException, ServletException {
+
+        PortalAuthManager m = new PortalAuthManager("app", "user", "secret", decryptor, "cookie");
+        Assert.assertNotNull(m.getAppCredentials());
+        String s = null;
+
+        MockHttpServletRequest request = new MockHttpServletRequest();
+        s = m.validateEcompSso(request);
+        logger.debug("validateEcompSso answers {}", s);
+        Assert.assertNull(s);
+
+        Cookie cookie = new Cookie(PortalApiConstants.EP_SERVICE, "bogus");
+        request.setCookies(cookie);
+        s = m.validateEcompSso(request);
+        logger.debug("validateEcompSso answers {}", s);
+        Assert.assertNull(s);
+
+        DashboardUserManager dum = new DashboardUserManager(true);
+        PortalAuthenticationFilter filter = new PortalAuthenticationFilter(false, m, dum);
+        filter.init(null);
+        filter.destroy();
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        try {
+            filter.doFilter(request, response, null);
+        } catch (NullPointerException ex) {
+            logger.debug("chain is null");
+        }
+
+        filter = new PortalAuthenticationFilter(true, m, dum);
+        try {
+            filter.doFilter(request, response, null);
+        } catch (NullPointerException ex) {
+            logger.debug("chain is null");
+        }
+    }
+
+}

diff --git a/near-rt-ric-simulator/ric-plt/a1/main.py b/near-rt-ric-simulator/ric-plt/a1/main.py
index 48b7f2e..a715f59 100644 (file)
--- a/near-rt-ric-simulator/ric-plt/a1/main.py
+++ b/near-rt-ric-simulator/ric-plt/a1/main.py
@@ -88,6 +88,18 @@ def set_status_with_reason(policyId, enforceStatus, enforceReason):
   policy_status[policyId] = ps
   return("Status updated for policy: " + policyId, 200)
 
+#Metrics function
+
+@app.route('/counter/<string:countername>', methods=['GET'])
+def getCounter(countername):
+    if (countername == "num_instances"):
+        return str(len(policy_instances)),200
+    elif (countername == "num_types"):
+        return str(len(policy_types)),200
+    else:
+        return "Counter name: "+countername+" not found.",404
+
+
 port_number = 8085
 if len(sys.argv) >= 2:
   if isinstance(sys.argv[1], int):