Merge "feat:optimize data type definition and data type reference"

2 files changed, 2 insertions, 47 deletions

diff --git a/usecaseui-portal/src/app/core/models/dataInterface.ts b/usecaseui-portal/src/app/core/models/dataInterface.ts
index 012b23e6..969651f4 100644
--- a/usecaseui-portal/src/app/core/models/dataInterface.ts
+++ b/usecaseui-portal/src/app/core/models/dataInterface.ts
@@ -2,55 +2,10 @@ enum baseUrl{
     baseUrl = '/api/usecaseui-server/v1'  //online
     // baseUrl = 'http://10.73.191.100:8082'    //local two
 }
-interface homeData {
-    services:{
-        number:number,
-        chartdata:Object[]
-    },
-    performance:{
-        per_Vnf:number,
-        per_VmPm:number
-    },
-    alarm:{
-        chartdata:Object[]
-    },
-    Vm_performance:{
-        names:string[]
-    }
-};
-
-interface homeVmLineData {
-    CPU:number[],
-    Memory:number[]
-}
-
-interface servicesSelectData {
-    customer:string[],
-    serviceType:string[]
-}
 
 interface servicesTableData {
     total:number,
     tableList:string[]
 }
 
-interface creatensData {
-    total:number,
-    tableList:string[]
-}
-
-interface onboardTableData {
-    total:number,
-    tableList:string[]
-}
-
-interface onboardDataVNF {
-    total:number,
-    tableList:string[]
-}
-
-interface onboardDataPNF {
-    total:number,
-    tableList:string[]
-}
-export {homeData, homeVmLineData, servicesSelectData, servicesTableData, creatensData, onboardTableData, onboardDataVNF, onboardDataPNF , baseUrl}
+export {servicesTableData , baseUrl}
diff --git a/usecaseui-portal/src/app/core/services/serviceList.service.ts b/usecaseui-portal/src/app/core/services/serviceList.service.ts
index 7953bc61..de3722c1 100644
--- a/usecaseui-portal/src/app/core/services/serviceList.service.ts
+++ b/usecaseui-portal/src/app/core/services/serviceList.service.ts
@@ -16,7 +16,7 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
-import { homeData, homeVmLineData, servicesSelectData, servicesTableData, creatensData, onboardTableData, onboardDataVNF, onboardDataPNF, baseUrl } from '../models/dataInterface';
+import {  servicesTableData,baseUrl } from '../models/dataInterface';
 
 @Injectable()
 export class ServiceListService {