Merge "feat:adjust the file schema of components related to service instances"

18 files changed, 16 insertions, 16 deletions

diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts
index 885bba67..092f82b4 100644
--- a/usecaseui-portal/src/app/app.module.ts
+++ b/usecaseui-portal/src/app/app.module.ts
@@ -48,12 +48,12 @@ import { PerformanceComponent } from './views/performance/performance.component'
 import { PerformanceVnfComponent } from './views/performance/performance-vnf/performance-vnf.component';
 import { PerformanceVmComponent } from './views/performance/performance-vm/performance-vm.component';
 import { CcvpnNetworkComponent } from './views/ccvpn-network/ccvpn-network.component';
-import { CcvpnDetailComponent } from './views/ccvpn-detail/ccvpn-detail.component';
-import { CcvpnCreationComponent } from './views/ccvpn-creation/ccvpn-creation.component';
+import { CcvpnDetailComponent } from './views/services/services-list/ccvpn-detail/ccvpn-detail.component';
+import { CcvpnCreationComponent } from './views/services/services-list/ccvpn-creation/ccvpn-creation.component';
 
 import { DetailsComponent } from './shared/components/details/details.component';
 import { GraphiclistComponent } from './shared/components/graphiclist/graphiclist.component';
-import { E2eCreationComponent } from './shared/components/e2e-creation/e2e-creation.component';
+import { E2eCreationComponent } from './views/services/services-list/e2e-creation/e2e-creation.component';
 
 import { BarComponent } from './shared/components/charts/bar/bar.component';
 import { LineComponent } from './shared/components/charts/line/line.component';
@@ -68,7 +68,7 @@ import { HomesService } from './core/services/homes.service';
 import { onboardService } from './core/services/onboard.service';
 import { networkHttpservice } from './core/services/networkHttpservice.service';
 import { PerformanceDetailsComponent } from './shared/components/performance-details/performance-details.component';
-import { E2eDetailComponent } from './shared/components/e2e-detail/e2e-detail.component';
+import { E2eDetailComponent } from './views/services/services-list/e2e-detail/e2e-detail.component';
 import { CustomerComponent } from './shared/components/customer/customer.component';
 import { ManagemencsService } from './core/services/managemencs.service';
 import { FcapsComponent } from './views/fcaps/fcaps.component';
diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.css b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.css
index 23d05259..8ea1b621 100644
--- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.css
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.css
@@ -44,14 +44,14 @@ hr {
     display: inline-block;
     width: 35px;
     height: 35px;
-    background:url("../../../assets/images/Return-icon.png") no-repeat!important;
+    background:url("../../../../../assets/images/Return-icon.png") no-repeat!important;
     background-size: 100%!important;
     border-radius:4px;
     color: #D7D7D7;
     cursor: pointer;    
 }
 .model .back:hover{
-    background: url("../../../assets/images/Return-icon-active.png")!important;
+    background: url("../../../../../assets/images/Return-icon-active.png")!important;
     background-size: 100%!important;
 }
 .top-title h3.title {
diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.html b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.html
index 1fc9a500..1fc9a500 100644
--- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.html
diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.spec.ts
index 30402412..30402412 100644
--- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.spec.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.spec.ts
diff --git a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts
index b0d464f3..5a94e484 100644
--- a/usecaseui-portal/src/app/views/ccvpn-creation/ccvpn-creation.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-creation/ccvpn-creation.component.ts
@@ -15,7 +15,7 @@
 */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
 import * as d3 from 'd3';
-import { ServiceListService } from '../../core/services/serviceList.service';
+import { ServiceListService } from '../../../../core/services/serviceList.service';
 
 @Component({
     selector: 'app-ccvpn-creation',
diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.css b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.css
index 2de3c1cc..8d005d40 100644
--- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.css
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.css
@@ -58,14 +58,14 @@ hr {
     display: inline-block;
     width: 35px;
     height: 35px;
-    background:url("../../../assets/images/Return-icon.png") no-repeat!important;
+    background:url("../../../../../assets/images/Return-icon.png") no-repeat!important;
     background-size: 100%!important;
     border-radius:4px;
     color: #D7D7D7;
     cursor: pointer;
 }
 .model .back:hover{
-    background: url("../../../assets/images/Return-icon-active.png")!important;
+    background: url("../../../../../assets/images/Return-icon-active.png")!important;
     background-size: 100%!important;
 }
 .top-title h3.title {
diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.html b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.html
index e2b5159e..e2b5159e 100644
--- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.html
diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.spec.ts
index b6f3171f..b6f3171f 100644
--- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.spec.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.spec.ts
diff --git a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.ts b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.ts
index e8110fda..a253b044 100644
--- a/usecaseui-portal/src/app/views/ccvpn-detail/ccvpn-detail.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/ccvpn-detail/ccvpn-detail.component.ts
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { ServiceListService } from '../../core/services/serviceList.service';
+import { ServiceListService } from '../../../../core/services/serviceList.service';
 import * as d3 from 'd3';
 
 @Component({
diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.css b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.css
index 5dce6c92..5dce6c92 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.css
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.css
diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.html
index da673bf0..da673bf0 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.html
diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.less b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.less
index 2964dad9..3679079e 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.less
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.less
@@ -59,14 +59,14 @@ hr {
         display: inline-block;
         width: 35px;
         height: 35px;
-        background:url("../../../../assets/images/Return-icon.png") no-repeat!important;
+        background:url("../../../../../assets/images/Return-icon.png") no-repeat!important;
         background-size: 100%!important;
         border-radius:4px;
         color: #D7D7D7;
         cursor: pointer;
     }
     .back:hover{
-        background: url("../../../../assets/images/Return-icon-active.png")!important;
+        background: url("../../../../../assets/images/Return-icon-active.png")!important;
         background-size: 100%!important;
     }
     .top-title h3.title {
diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.spec.ts
index de00c43f..de00c43f 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.spec.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.spec.ts
diff --git a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts
index accc6dbb..f1df9636 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-creation/e2e-creation.component.ts
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { ServiceListService } from '../../../core/services/serviceList.service';
+import { ServiceListService } from '../../../../core/services/serviceList.service';
 import * as d3 from 'd3';
 
 @Component({
diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.html b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.html
index 976a9f6c..976a9f6c 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.html
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.html
diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.less b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.less
index bada5991..ad28a518 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.less
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.less
@@ -45,14 +45,14 @@ hr {
     display: inline-block;
     width: 35px;
     height: 35px;
-    background:url("../../../../assets/images/Return-icon.png") no-repeat!important;
+    background:url("../../../../../assets/images/Return-icon.png") no-repeat!important;
     background-size: 100%!important;
     border-radius:4px;
     color: #D7D7D7;
     cursor: pointer;
   }
   .back:hover{
-    background: url("../../../../assets/images/Return-icon-active.png")!important;
+    background: url("../../../../../assets/images/Return-icon-active.png")!important;
     background-size: 100%!important;
   }
   .top-title h3.title {
diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.spec.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.spec.ts
index ad24a477..ad24a477 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.spec.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.spec.ts
diff --git a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.ts b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts
index 9f38ffa5..50f63b3e 100644
--- a/usecaseui-portal/src/app/shared/components/e2e-detail/e2e-detail.component.ts
+++ b/usecaseui-portal/src/app/views/services/services-list/e2e-detail/e2e-detail.component.ts
@@ -15,7 +15,7 @@
 */
 
 import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { ServiceListService } from '../../../core/services/serviceList.service';
+import { ServiceListService } from '../../../../core/services/serviceList.service';
 import * as d3 from 'd3';
 
 @Component({