summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2019-12-08 16:28:21 +0000
committerGerrit Code Review <gerrit@onap.org>2019-12-08 16:28:21 +0000
commit56c11ebfcb986fb634f0b35104c5dabcd90a7aaa (patch)
treeffc9ba7802c2e5c5f6d250f0d95ffb19940b56d6 /usecaseui-portal
parent1509c71a7a690e4e5a80bd2fe21eb3eaf87df677 (diff)
parent3a68f27fb4a3d8a02442ad9a98ffd46d055368bb (diff)
Merge "feat:add mockjson data of slicing page"
Diffstat (limited to 'usecaseui-portal')
-rw-r--r--usecaseui-portal/src/app/app.module.ts4
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_business_list.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list.json2
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json34
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nssi_list.json107
-rw-r--r--usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json59
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html3
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less0
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.spec.ts25
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts15
-rw-r--r--usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts1
11 files changed, 232 insertions, 20 deletions
diff --git a/usecaseui-portal/src/app/app.module.ts b/usecaseui-portal/src/app/app.module.ts
index 37556131..a34bca7f 100644
--- a/usecaseui-portal/src/app/app.module.ts
+++ b/usecaseui-portal/src/app/app.module.ts
@@ -96,6 +96,7 @@ import { BasicInfoComponent } from './shared/components/basic-info/basic-info.co
import { CheckProcessModelComponent } from './views/services/slicing-management/slicing-task-management/check-process-model/check-process-model.component'
import { NsiTableComponent } from './views/services/slicing-management/slicing-resource-management/nsi-management/nsi-table/nsi-table.component'
import { NssiTableComponent } from './views/services/slicing-management/slicing-resource-management/nssi-management/nssi-table/nssi-table.component'
+import { SlicingBusinessModelComponent } from './views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component'
@NgModule({
providers: [
@@ -156,7 +157,8 @@ import { NssiTableComponent } from './views/services/slicing-management/slicing-
BasicInfoComponent,
CheckProcessModelComponent,
NsiTableComponent,
- NssiTableComponent
+ NssiTableComponent,
+ SlicingBusinessModelComponent
],
imports: [
BrowserModule,
diff --git a/usecaseui-portal/src/app/mock/json/slicing_business_list.json b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
index 46201850..48145fdc 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_business_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_business_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing service instances query result."
},
"result_body": {
- "record_number": 14,
+ "record_number": 30,
"slicing_business_list": [
{
"service_instance_id": "23edd22b-a0b2-449f-be87-d094159b9265",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
index 63a26f5c..418d8193 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list.json
@@ -4,7 +4,7 @@
"result_message": "5G slicing NSI service instances result."
},
"result_body": {
- "record_number": 12,
+ "record_number": 20,
"nsi_service_instances": [
{
"service_instance_order": "1",
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
index 327352c8..480d0694 100644
--- a/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
+++ b/usecaseui-portal/src/app/mock/json/slicing_nsi_list_activated.json
@@ -4,63 +4,63 @@
"result_message": "5G slicing NSI service instances result."
},
"result_body": {
- "record_number":8,
+ "record_number": 2,
"nsi_service_instances": [
{
"service_instance_order": "1",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959411a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "2",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959413a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "3",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "4",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "5",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959415a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "6",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959417a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "7",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959419a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
},
{
"service_instance_order": "8",
"service_instance_id": "46da8cf8-0878-48ac-bea3-f2200959421a",
"service_instance_name": "eMBB instancel",
- "nsi_type":"eMBB",
- "nsi_orchestration-status": "activated"
+ "service_type":"eMBB",
+ "orchestration-status": "activated"
}
]
}
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json b/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json
new file mode 100644
index 00000000..315087b9
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/slicing_nssi_list.json
@@ -0,0 +1,107 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing NSSI query result."
+ },
+ "result_body": {
+ "record_number": 12,
+ "nssi_service_instances": [
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "2",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-02-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "3",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-03-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "4",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-04-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "5",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-05-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "6",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-06-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "7",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-07-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "8",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-08-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "9",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-09-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "10",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-10-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "11",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-11-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ },
+ {
+ "service_instance_order": "12",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-12-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "deactivated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json b/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json
new file mode 100644
index 00000000..d40addba
--- /dev/null
+++ b/usecaseui-portal/src/app/mock/json/slicing_nssi_list_activated.json
@@ -0,0 +1,59 @@
+{
+ "result_header": {
+ "result_code": "200",
+ "result_message": "5G slicing NSSI query result."
+ },
+ "result_body": {
+ "record_number": 6,
+ "nssi_service_instances": [
+ {
+ "service_instance_order": "1",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-01-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "2",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-02-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "5",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-05-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "6",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-06-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "9",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-09-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ },
+ {
+ "service_instance_order": "10",
+ "service_instance_id": "NSSI-C-001-HDBNJ-NSSMF-10-A-ZX",
+ "service_instance_name": "slicing_core_notwork",
+ "service_type": "slicing_core_notwork",
+ "environment_context": "cn",
+ "orchestration_status": "activated"
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
new file mode 100644
index 00000000..839e3aa8
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.html
@@ -0,0 +1,3 @@
+<p>
+ slicing-business-model works!
+</p>
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.less
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.spec.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.spec.ts
new file mode 100644
index 00000000..1f8f1164
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SlicingBusinessModelComponent } from './slicing-business-model.component';
+
+describe('SlicingBusinessModelComponent', () => {
+ let component: SlicingBusinessModelComponent;
+ let fixture: ComponentFixture<SlicingBusinessModelComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SlicingBusinessModelComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SlicingBusinessModelComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
new file mode 100644
index 00000000..dc144c97
--- /dev/null
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-model/slicing-business-model.component.ts
@@ -0,0 +1,15 @@
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+ selector: 'app-slicing-business-model',
+ templateUrl: './slicing-business-model.component.html',
+ styleUrls: ['./slicing-business-model.component.less']
+})
+export class SlicingBusinessModelComponent implements OnInit {
+
+ constructor() { }
+
+ ngOnInit() {
+ }
+
+}
diff --git a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
index 05592569..ffcb2fe0 100644
--- a/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
+++ b/usecaseui-portal/src/app/views/services/slicing-management/slicing-resource-management/slicing-business-management/slicing-business-table/slicing-business-table.component.ts
@@ -170,6 +170,7 @@ export class SlicingBusinessTableComponent implements OnInit {
requery();
},5000);
} else {
+ clearInterval(this.progressingTimer);
res(data.result_body);
}
})