From 0a5b5aec1d24cbc81356e74fb6d69c266b125c78 Mon Sep 17 00:00:00 2001
From: "Sonsino, Ofir (os0695)" <os0695@intl.att.com>
Date: Sun, 15 Apr 2018 16:36:39 +0300
Subject: Change ASDC to SDC everywhere in VID UI

Change-Id: I5149e2a3751370c9757c2b6a2bbff2984cc979b8
Issue-ID: VID-211
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
---
 .../org/onap/vid/asdc/rest/RestfulAsdcClient.java  | 38 +++++++++++-----------
 .../java/org/onap/vid/services/VidServiceImpl.java |  2 +-
 .../scripts/controller/aaiSubscriberController.js  |  2 +-
 .../src/test/resources/WEB-INF/jsp/welcome.jsp     | 17 ++++------
 4 files changed, 28 insertions(+), 31 deletions(-)

(limited to 'vid-app-common')

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 dce1e1bf..7ac0fa39 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 3b9d6510..55243019 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 d58b83f6..aeac7f33 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 1396819c..ef6b2d5e 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>
 
 	
 
-- 
cgit 1.2.3-korg