diff options
6 files changed, 30 insertions, 33 deletions
diff --git a/epsdk-app-onap/src/main/resources/vid-data.sql b/epsdk-app-onap/src/main/resources/vid-data.sql index 232ee7ef0..b570c6630 100755 --- a/epsdk-app-onap/src/main/resources/vid-data.sql +++ b/epsdk-app-onap/src/main/resources/vid-data.sql @@ -533,7 +533,7 @@ INSERT INTO `fn_menu` VALUES (2,'VID Home',1,10,'welcome.htm','menu_home','Y',NU INSERT INTO `fn_menu` VALUES (3,'Search for Existing Service Instances',1,10,'serviceModels.htm#/instances/services','menu_searchexisting','Y',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='Search for Existing Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm#/instances/services', FUNCTION_CD='menu_searchexisting', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
INSERT INTO `fn_menu` VALUES (10,'Admin',1,110,'role_list.htm','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','icon-settings') ON DUPLICATE KEY UPDATE LABEL='Admin', PARENT_ID=1, SORT_ORDER=110, ACTION='admin', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-settings';
INSERT INTO `fn_menu` VALUES (13,'VID Logout',1,130,'app_logout.htm','menu_logout','N',NULL,NULL,NULL,NULL,'APP','N','icon-sign-out') ON DUPLICATE KEY UPDATE LABEL='VID Logout', PARENT_ID=1, SORT_ORDER=130, ACTION='app_logout.htm', FUNCTION_CD='menu_logout', ACTIVE_YN='N', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-sign-out';
-INSERT INTO `fn_menu` VALUES (42,'Browse ASDC Service Models',1,10,'serviceModels.htm','menu_servicemodels','Y',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='Browse ASDC Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm', FUNCTION_CD='menu_servicemodels', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
+INSERT INTO `fn_menu` VALUES (42,'Browse SDC Service Models',1,10,'serviceModels.htm','menu_servicemodels','Y',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='Browse SDC Service Instances', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm', FUNCTION_CD='menu_servicemodels', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
INSERT INTO `fn_menu` VALUES (41,'Create New Service Instance',1,10,'serviceModels.htm#/instances/subscribers','menu_newserinstance','Y',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='Create New Service Instance', PARENT_ID=1, SORT_ORDER=10, ACTION='serviceModels.htm#/instances/subscribers', FUNCTION_CD='menu_newserinstance', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
INSERT INTO `fn_menu` VALUES (43,'View Log',1,10,'viewlog.htm','menu_viewlog','N',NULL,NULL,NULL,NULL,'APP','N','icon-location-pin') ON DUPLICATE KEY UPDATE LABEL='View Log', PARENT_ID=1, SORT_ORDER=10, ACTION='viewlog.htm', FUNCTION_CD='menu_viewlog', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='icon-location-pin';
INSERT INTO `fn_menu` VALUES (101,'Roles',10,20,'admin','menu_admin','Y',NULL,NULL,NULL,NULL,'APP','N','/static/fusion/images/users.png') ON DUPLICATE KEY UPDATE LABEL='Roles', PARENT_ID=10, SORT_ORDER=20, ACTION='admin', FUNCTION_CD='menu_admin', ACTIVE_YN='Y', SERVLET=NULL, QUERY_STRING=NULL, EXTERNAL_URL=NULL, TARGET=NULL, MENU_SET_CD='APP', SEPARATOR_YN='N', IMAGE_SRC='/static/fusion/images/users.png';
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java index dce1e1bf8..7ac0fa398 100644 --- a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java +++ b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/RestfulAsdcClient.java @@ -201,10 +201,10 @@ public class RestfulAsdcClient implements AsdcClient { .get(Resource.class); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -227,10 +227,10 @@ public class RestfulAsdcClient implements AsdcClient { .get(Artifact.class); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -254,10 +254,10 @@ public class RestfulAsdcClient implements AsdcClient { }); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -287,10 +287,10 @@ public class RestfulAsdcClient implements AsdcClient { }); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (NotFoundException e) { throw e; } catch (WebApplicationException e) { @@ -315,7 +315,7 @@ public class RestfulAsdcClient implements AsdcClient { return getToscaCsar(csarInputStream); } catch (IOException e) { - throw new AsdcCatalogException("Failed to retrieve resource TOSCA model from ASDC", e); + throw new AsdcCatalogException("Failed to retrieve resource TOSCA model from SDC", e); } } @@ -335,10 +335,10 @@ public class RestfulAsdcClient implements AsdcClient { .get(Service.class); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -362,10 +362,10 @@ public class RestfulAsdcClient implements AsdcClient { .get(Artifact.class); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -390,10 +390,10 @@ public class RestfulAsdcClient implements AsdcClient { }); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); @@ -425,10 +425,10 @@ public class RestfulAsdcClient implements AsdcClient { }); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (NotFoundException e) { throw e; } catch (WebApplicationException e) { @@ -457,10 +457,10 @@ public class RestfulAsdcClient implements AsdcClient { return getToscaCsar(csarInputStream); } catch (ResponseProcessingException e) { //Couldn't convert response to Java type - throw new AsdcCatalogException("ASDC response could not be processed", e); + throw new AsdcCatalogException("SDC response could not be processed", e); } catch (ProcessingException e) { //IO problems during request - throw new AsdcCatalogException("Failed to get a response from ASDC service", e); + throw new AsdcCatalogException("Failed to get a response from SDC service", e); } catch (WebApplicationException e) { //Web service returned data, but the response status wasn't a good one (i.e. non 2xx) throw new AsdcCatalogException(e); diff --git a/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java index 3b9d65107..552430195 100644 --- a/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java +++ b/vid-app-common/src/main/java/org/onap/vid/services/VidServiceImpl.java @@ -62,7 +62,7 @@ public class VidServiceImpl implements VidService { final Service asdcServiceMetadata = asdcClient.getService(UUID.fromString(uuid)); return getServiceModel(uuid, serviceCsar, tosca, asdcServiceMetadata); } catch (Exception e) { - LOG.error("Failed to download and proccess service from ASDC", e); + LOG.error("Failed to download and proccess service from SDC", e); } return serviceModel; } diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js index d58b83f69..aeac7f336 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js @@ -172,7 +172,7 @@ appDS2.controller("aaiSubscriberController", ["COMPONENT", "FIELD", "PARAMETER", $scope.isSpinnerVisible = false;
$scope.isProgressVisible = false;
} else {
- $scope.status = "Failed to get service models from ASDC.";
+ $scope.status = "Failed to get service models from SDC.";
$scope.error = true;
$scope.isSpinnerVisible = false;
}
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 index 1396819c7..ef6b2d5e6 100644 --- a/vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp +++ b/vid-app-common/src/test/resources/WEB-INF/jsp/welcome.jsp @@ -1,27 +1,24 @@ <script src="app/vid/external/multiselect/angular-bootstrap-multiselect.min.js"></script> <div> - <h1 class="heading1">AT&T Domain 2.0 Network</h1> + <h1 class="heading1">ONAP</h1> <br> <h1 class="heading1"><u>Welcome to VID</u></h1> <br> 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. <br><br> - <h1 class="heading1"><u>About VID</u></h1> - 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. - <br><br> - <h1 class="heading1"><a href="mailto:VID-Tier4@ist.att.com" target="_top">Contact Us</a></h1> - <a href="mailto:VID-Tier4@ist.att.com" target="_top">Please click here to contact us.</a> + + <h1 class="heading1"><a href="mailto:portal@lists.onap.org" target="_top">Contact Us</a></h1> + <a href="mailto:portal@lists.onap.org" target="_top">Please click here to contact us.</a> diff --git a/vid-automation/src/main/java/vid/automation/test/Constants.java b/vid-automation/src/main/java/vid/automation/test/Constants.java index 17b96fc74..f012d0099 100644 --- a/vid-automation/src/main/java/vid/automation/test/Constants.java +++ b/vid-automation/src/main/java/vid/automation/test/Constants.java @@ -41,7 +41,7 @@ public class Constants { public static final int numOfButtons = 7; public static final String buttonClass = "att-accordion__group"; public static final String SEARCH_EXISTING_SERVICE = "Search for Existing Service Instances"; - public static final String BROWSE_ASDC_SERVICE_MODELS = "Browse ASDC Service Models"; + public static final String BROWSE_ASDC_SERVICE_MODELS = "Browse SDC Service Models"; public static final String CREATE_NEW_SERVICE = "Create New Service Instance"; public static final String VNF_CHANGES = "VNF Changes"; public static final String TEST_ENVIRONMENTS = "Test Environments"; |