From 9dfd7e28c1eb348fcb4a2de8c6faae2a01b34942 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Wed, 20 Sep 2017 13:20:42 +0300 Subject: Global Read only role, Support VID specific Roles Issue-ID: VID-46 , VID-47 Change-Id: Ib100d20ac40a65d39e27a6e2741b19a173a2b8ea Signed-off-by: Ofir Sonsino --- .../WEB-INF/jsp/createnewserviceinstance.jsp | 146 ++++++++++++++++ .../src/test/resources/WEB-INF/jsp/login.jsp | 125 ++++++++++++++ .../test/resources/WEB-INF/jsp/login_external.jsp | 126 ++++++++++++++ .../resources/WEB-INF/jsp/searchexistingsi.jsp | 81 +++++++++ .../test/resources/WEB-INF/jsp/serviceModels.jsp | 82 +++++++++ .../resources/WEB-INF/jsp/subscriberdetails.jsp | 184 +++++++++++++++++++++ .../src/test/resources/WEB-INF/jsp/testMso.jsp | 174 +++++++++++++++++++ .../test/resources/WEB-INF/jsp/testViewEdit.jsp | 172 +++++++++++++++++++ .../src/test/resources/WEB-INF/jsp/viewlog.jsp | 33 ++++ .../src/test/resources/WEB-INF/jsp/welcome.jsp | 49 ++++++ 10 files changed, 1172 insertions(+) create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/createnewserviceinstance.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/login.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/login_external.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/subscriberdetails.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp create mode 100644 vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp (limited to 'vid-app-common/src/test/resources/WEB-INF/jsp') diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/createnewserviceinstance.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/createnewserviceinstance.jsp new file mode 100644 index 00000000..fd2030e6 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/createnewserviceinstance.jsp @@ -0,0 +1,146 @@ + + +

+ +

Create New Service Instance

+ + +
+ + + + + + + + + + + + + + + +

+ + +

+ Subscriber: +

+ +

+ + +

+ Service Type: +

+ +

+ + + + + + + +

+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/login.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/login.jsp new file mode 100644 index 00000000..804c0bfe --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/login.jsp @@ -0,0 +1,125 @@ +<%@ page import="java.net.URLEncoder"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + // Requests are handled by class ProcessCspController in the EP-SDK-Core library. + // On login error, that controller returns a model that is a String->String map. + + // CSP property is defined in fusion.properties file + final String cspLoginUrl = SystemProperties.getProperty(SystemProperties.CSP_LOGIN_URL); + // Name is defined by app; do not throw if missing + final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME) + ? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME) + : SystemProperties.APP_DISPLAY_NAME; + // Build login-link URL using parameters and/or system properties + String returnUrl = request.getParameter("returnUrl"); + if (returnUrl == null) { + final String cspPage = "doLogin"; + if (SystemProperties.containsProperty(SystemProperties.APP_BASE_URL)) { + // Use property with the application URL; e.g., WebJunction + String appUrl = SystemProperties.getProperty(SystemProperties.APP_BASE_URL); + returnUrl = appUrl + (appUrl.endsWith("/") ? "" : "/") + cspPage; + } else { + // Use server info; incorrect for sites behind WebJunction. + returnUrl = (request.isSecure() ? "https://" : "http://") + request.getServerName() + ":" + + request.getServerPort() + request.getContextPath() + "/" + cspPage; + } + } else { + // Request has a parameter with the return URL + returnUrl = URLEncoder.encode(returnUrl, "UTF-8"); + } +%> + + + + + + + + + + + +

+ +
+
+
+

${model.error}

+
+
+
+
+
+
+ + + diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/login_external.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/login_external.jsp new file mode 100644 index 00000000..dfa3305f --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/login_external.jsp @@ -0,0 +1,126 @@ +<%-- + ================================================================================ + ECOMP Portal SDK + ================================================================================ + Copyright (C) 2017 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. + ================================================================================ +--%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> + +<% + // Name is defined by app; do not throw if missing + final String appDisplayName = SystemProperties.containsProperty(SystemProperties.APP_DISPLAY_NAME) + ? SystemProperties.getProperty(SystemProperties.APP_DISPLAY_NAME) + : SystemProperties.APP_DISPLAY_NAME; +%> + + + + + + + + + + +

+ +
+
+

${model.error}

+
+
+
+
+
+
+ + + diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp new file mode 100644 index 00000000..2c7dd9f5 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/searchexistingsi.jsp @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +

+ + + +

+ +

+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp new file mode 100644 index 00000000..3280bc65 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/serviceModels.jsp @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +

+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/subscriberdetails.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/subscriberdetails.jsp new file mode 100644 index 00000000..ca92b152 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/subscriberdetails.jsp @@ -0,0 +1,184 @@ +<%@ include file="/WEB-INF/fusion/jsp/popup_modal.html" %> +

Selected Subscriber's Service Instance Details:

+ + + + + + + + + + + + + + + + + + + + +

View/Edit	Global Customer ID	Subscriber Name	Service Type	Service Instance ID
+ + + View/Edit + + +	{{disData.globalCustomerId}}	{{disData.subscriberName}}	{{disData.serviceType}}	{{disData.serviceInstanceId}}

+ + + +

+ +

+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp new file mode 100644 index 00000000..abcc8e26 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testMso.jsp @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +

+ +

+ Various MSO Tests +

+ Use test MSO + controller +

These actions are expected to return successfully.

+ + + + + + + + + + + +

These actions are expected to generate errors. These tests assume the above + "Use test MSO controller" checkbox is checked. All tests are base on the Create Service + Instance transaction.

+ Initial + response contains policy exception +
+ Initial + response contains service exception +
+ Subsequent + getOrchestrationRequest poll response contains MSO failure condition +
+ Initial + response contains invalid data field +
+ Subsequent + getOrchestrationRequest poll response contains invalid data field +
+ + VID controller code generates general exception +
+ Maximum + poll attempts exceeded +
+ Timeout + on initial response +
+ Timeout + on subsequent getOrchestrationRequest poll response +
+ GUI + front-end specifies invalid URL - HTTP 404 response expected +
+ GUI + front-end specifies invalid URL - HTTP 405 response expected +

+ +

+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp new file mode 100644 index 00000000..031fedf8 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/testViewEdit.jsp @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%@ page import="org.openecomp.vid.mso.*"%> +<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<% + String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + + ",msoMaxPollingIntervalMsec:" + + SystemProperties.getProperty(MsoProperties.MSO_POLLING_INTERVAL_MSECS) + "}"; +%> + +

+ +

+ Test View Edit Page +

+ These buttons simulate the add, delete and "show details" (called + "script" in User Stories) icons (or buttons) that are expected on the + view / edit page. +

+ Use test MSO + controller +

CALLBACK: {{callbackResults}}

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Service	+ +	+ +	+ +
VNF	+ +	+ +	+ +
VF Module	+ +	+ +	+ +
Volume Group	+ +	+ +	+ +
Network	+ +	+ +	+ +

+ + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp new file mode 100644 index 00000000..920298e1 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/viewlog.jsp @@ -0,0 +1,33 @@ + + +

+ +

View Log - Page under Construction...

+
+ + +

+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp b/vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp new file mode 100644 index 00000000..dcd99689 --- /dev/null +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp @@ -0,0 +1,49 @@ + +

AT&T Domain 2.0 Network

+
+

Welcome to VID

+
+ The Virtual Infrastructure Deployment (VID) application allows infrastructure service deployment operators + to instantiate service instances and their constituent parts for Distributed service models required by the + internal AT&T service operations organizations that manage them, such as Mobility Network Services, + Netbond Services, or FlexReach Services. The models are defined by ECOMP component ASDC. The service + deployment operator selects the service operations owner and model that they wish to instantiate. After + entry of appropriate data, the operator instructs VID to direct another ECOMP component, MSO, to instantiate + the selected service model. Once the service instance has been instantiated, the service operator can instruct + VID to direct MSO to instantiate the service instance's component VNFs, VF Modules, Networks and Volume Groups. + The VID user can also search for, and display, existing service instances and direct the instantiation of + subsequent instance components. +

+

About VID

+ VID was originally developed for the October 2016 release by an integrated IT and Labs team, under the + direction of Steve Smokowski and Vivian Pressley. +

+

Contact Us

+ Please click here to contact us. + + + +
+ + + +

+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + -- cgit 1.2.3-korg