Add backend Code for customer/serviceType management UI page

Change-Id: I008365b50908a1347e9b74e3c64673087a25df36
Issue-ID: USECASEUI-213
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscription.java b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscription.java
index 2218cff..8944816 100644 (file)
--- a/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscription.java
+++ b/server/src/main/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscription.java
@@ -23,14 +23,22 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class AAIServiceSubscription {
 
     private String serviceType;
+    
+    private String resourceVersion;
 
     @JsonCreator
-    public AAIServiceSubscription(@JsonProperty("service-type") String serviceType) {
+    public AAIServiceSubscription(@JsonProperty("service-type") String serviceType,@JsonProperty("resource-version") String resourceVersion) {
         this.serviceType = serviceType;
+        this.resourceVersion = resourceVersion;
     }
 
     @JsonProperty("service-type")
     public String getServiceType() {
         return serviceType;
     }
+    
+    @JsonProperty("resource-version")
+    public String getResourceVersion() {
+        return resourceVersion;
+    }
 }

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscriptionTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscriptionTest.java
index 6082cba..ff8bc24 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscriptionTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/domain/aai/bean/AAIServiceSubscriptionTest.java
@@ -52,7 +52,7 @@ public class AAIServiceSubscriptionTest {
 
        @Test
        public void testAAIServiceSubscription() throws Exception {
-               AAIServiceSubscription ass = new AAIServiceSubscription("serviceType");
+               AAIServiceSubscription ass = new AAIServiceSubscription("serviceType","resourceVersion");
                ass.getServiceType();
        }
 }

diff --git a/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerServiceTest.java b/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerServiceTest.java
index 6ba2fa3..83c19fa 100644 (file)
--- a/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerServiceTest.java
+++ b/server/src/test/java/org/onap/usecaseui/server/service/lcm/impl/DefaultCustomerServiceTest.java
@@ -76,7 +76,7 @@ public class DefaultCustomerServiceTest {
 
     @Test
     public void itCanRetrieveServiceSubscriptionsFromAAI() {
-        List<AAIServiceSubscription> serviceSubscriptions = singletonList(new AAIServiceSubscription("service type"));
+        List<AAIServiceSubscription> serviceSubscriptions = singletonList(new AAIServiceSubscription("service type","resourceVersion"));
 
         AAIService aaiService = mock(AAIService.class);
         ServiceSubscriptionRsp rsp = new ServiceSubscriptionRsp();