From efedea1c5d80532f5b1180d57c8dafce5dcb302a Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Tue, 20 Feb 2018 18:03:30 +0200 Subject: org.onap migration Change-Id: I5e2d01a6da21d4003c910b5fe0702b35c2089a77 Issue-ID: VID-86 Signed-off-by: Ofir Sonsino --- .../src/main/webapp/WEB-INF/jsp/login.jsp | 40 +++++- .../src/main/webapp/WEB-INF/jsp/login_external.jsp | 135 +++++++++++++++++++++ .../main/webapp/WEB-INF/jsp/searchexistingsi.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/serviceModels.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/testMso.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/testViewEdit.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/welcome.jsp | 24 ++-- 7 files changed, 184 insertions(+), 23 deletions(-) create mode 100644 epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp (limited to 'epsdk-app-onap/src/main/webapp/WEB-INF/jsp') diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp index 1fa75ed0..842eabd8 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login.jsp @@ -1,5 +1,41 @@ -<%@ page import="java.net.URLEncoder"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%-- + ============LICENSE_START========================================== + ONAP Portal SDK + =================================================================== + Copyright © 2017 AT&T Intellectual Property. All rights reserved. + =================================================================== + + Unless otherwise specified, all software contained herein is licensed + under the Apache License, Version 2.0 (the “License”); + you may not use this software 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. + + Unless otherwise specified, all documentation contained herein is licensed + under the Creative Commons License, Attribution 4.0 Intl. (the “License”); + you may not use this documentation except in compliance with the License. + You may obtain a copy of the License at + + https://creativecommons.org/licenses/by/4.0/ + + Unless required by applicable law or agreed to in writing, documentation + 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============================================ + + ECOMP is a trademark and service mark of AT&T Intellectual Property. +--%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% // Name is defined by app; do not throw if missing diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp new file mode 100644 index 00000000..15e228ec --- /dev/null +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/login_external.jsp @@ -0,0 +1,135 @@ +<%-- + ============LICENSE_START========================================== + ONAP Portal SDK + =================================================================== + Copyright © 2017 AT&T Intellectual Property. All rights reserved. + =================================================================== + + Unless otherwise specified, all software contained herein is licensed + under the Apache License, Version 2.0 (the “License”); + you may not use this software 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. + + Unless otherwise specified, all documentation contained herein is licensed + under the Creative Commons License, Attribution 4.0 Intl. (the “License”); + you may not use this documentation except in compliance with the License. + You may obtain a copy of the License at + + https://creativecommons.org/licenses/by/4.0/ + + Unless required by applicable law or agreed to in writing, documentation + 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============================================ + + ECOMP is a trademark and service mark of AT&T Intellectual Property. +--%> +<%@ page import="org.onap.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/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp index 76fe13e4..bf3fc572 100644 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/searchexistingsi.jsp @@ -44,7 +44,7 @@ <%@ page import="org.onap.vid.mso.*"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + ",msoMaxPollingIntervalMsec:" diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp index 7a983a10..8ec3a8d7 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/serviceModels.jsp @@ -88,7 +88,7 @@ <%@ page import="org.onap.vid.mso.*"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + ",msoMaxPollingIntervalMsec:" diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp index 87f863f0..56eb59ef 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testMso.jsp @@ -32,7 +32,7 @@ REST / Angular mechanism. --> <%@ page import="org.onap.vid.mso.*"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + ",msoMaxPollingIntervalMsec:" diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp index f8d8d9c3..66bb5044 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/testViewEdit.jsp @@ -41,7 +41,7 @@ REST / Angular mechanism. --> <%@ page import="org.onap.vid.mso.*"%> -<%@ page import="org.openecomp.portalsdk.core.util.SystemProperties"%> +<%@ page import="org.onap.portalsdk.core.util.SystemProperties"%> <% String properties = "{msoMaxPolls:" + SystemProperties.getProperty(MsoProperties.MSO_MAX_POLLS) + ",msoMaxPollingIntervalMsec:" diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp index b505909f..e52484e2 100755 --- a/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/epsdk-app-onap/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -1,36 +1,27 @@
-

AT&T Domain 2.0 Network

+

ONAP


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 + ONAP service operations that manage them, such as Mobility Network Services, etc. + The models are defined by ONAP component SDC. 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 + entry of appropriate data, the operator instructs VID to direct another ONAP 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. - + +

Contact Us

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


@@ -47,4 +38,3 @@

- -- cgit 1.2.3-korg