summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2019-08-21 02:50:34 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-21 02:50:34 +0000
commit6e325eb872723174839f3d9911d0fd8d3756b07f (patch)
tree861ee8de05acd0a76fa48e2f5de27cd17f633f90 /usecaseui-portal/src
parent8455cd58da3765c0191c2b8fab4f3297cd3eecc9 (diff)
parent9f095ef4e489b7bbdae33b2dece0193262111ef8 (diff)
Merge "feat:Optimize ccvpn instance creation"
Diffstat (limited to 'usecaseui-portal/src')
-rw-r--r--usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.html12
-rw-r--r--usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.spec.ts1
-rw-r--r--usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts36
3 files changed, 2 insertions, 47 deletions
diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.html b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.html
index 3a337ea6..1645325c 100644
--- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.html
+++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.html
@@ -13,8 +13,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!--<h3 class="title"> Services List </h3>-->
-<!--<hr>-->
<div class="model creation-model">
<div class="top-title">
@@ -37,6 +35,7 @@
</svg>
</div>
</div>
+ <!--Template resolution : Three major items-->
<div class="creation">
<nz-tabset [nzTabPosition]="'top'" [nzShowPagination]=false [nzTabBarGutter]="'2'" [nzTabBarStyle]=tabBarStyle>
<nz-tab nzTitle="Service Info">
@@ -67,7 +66,6 @@
</tr>
</thead>
<tbody>
- <!-- <ng-template ngFor let-data [ngForOf]="siteTable.data" let-i="index"> -->
<tr *ngFor="let item of sotnVpnTable.data; let i = index; ">
<td>{{i+1}}</td>
<td *ngFor="let keys of getKeys(this.sotnInfo);let a = index;">
@@ -80,7 +78,6 @@
class="anticon anticon-delete"></i></span>
</td>
</tr>
- <!-- </ng-template> -->
</tbody>
</nz-table>
</div>
@@ -105,7 +102,6 @@
</tr>
</thead>
<tbody>
- <!-- <ng-template ngFor let-data [ngForOf]="siteTable.data" let-i="index"> -->
<tr *ngFor="let item of siteTable.data; let i = index; ">
<td>{{i+1}}</td>
<td *ngFor="let keys of getKeys(this.siteBaseData);let a = index;">
@@ -118,7 +114,6 @@
class="anticon anticon-delete"></i></span>
</td>
</tr>
- <!-- </ng-template> -->
</tbody>
</nz-table>
</div>
@@ -153,7 +148,6 @@
</tr>
</thead>
<tbody>
- <!-- <ng-template ngFor let-data [ngForOf]="siteModalTable.data" let-i="index"> -->
<tr *ngFor="let item of sotnSdwansitelanData; let i = index;"
[ngClass]="{'tr-border':item.tabInputShowSdwansitelan ==false}">
<td>{{i+1}}</td>
@@ -171,7 +165,6 @@
class="anticon anticon-delete"></i></span>
</td>
</tr>
- <!-- </ng-template> -->
</tbody>
</table>
</div>
@@ -227,7 +220,6 @@
class="anticon anticon-delete"></i></span>
</td>
</tr>
- <!-- </ng-template> -->
</tbody>
</table>
</div>
@@ -249,7 +241,6 @@
</tr>
</thead>
<tbody>
- <!-- <ng-template ngFor let-data [ngForOf]="siteModalTable.data" let-i="index"> -->
<tr *ngFor="let item of siteWanData; let i = index;"
[ngClass]="{'tr-border':item.tabInputShowWanPort ==false}">
<td>{{i+1}}</td>
@@ -267,7 +258,6 @@
class="anticon anticon-delete"></i></span>
</td>
</tr>
- <!-- </ng-template> -->
</tbody>
</table>
</div>
diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.spec.ts b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.spec.ts
index 922bd9ea..30402412 100644
--- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.spec.ts
+++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.spec.ts
@@ -1,7 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { CcvpnCreationComponent } from './ccvpn-creation.component';
-
describe('CcvpnCreationComponent', () => {
let component: CcvpnCreationComponent;
let fixture: ComponentFixture<CcvpnCreationComponent>;
diff --git a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
index 9cdd893c..f4c1f94c 100644
--- a/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
+++ b/usecaseui-portal/src/app/ccvpn-creation/ccvpn-creation.component.ts
@@ -133,12 +133,9 @@ export class CcvpnCreationComponent implements OnInit {
});
}
});
- console.log(inputss);
- console.log(this.bodyTemplateParameter);
-
this.showTemParametersSotnVpn();
this.showTemParametersSite();
- console.log(this.templateParameters)
+ console.log(this.bodyTemplateParameter,this.templateParameters)
}
//sotnVpn data, after combining the structure, rendering the template data to the page
@@ -249,26 +246,21 @@ export class CcvpnCreationComponent implements OnInit {
this.sotnSdwansitelanData[addNum] = inputsData;
this.tabInputShowSdwansitelan[addNum] = true;
this.sotnSdwansitelanData = [...this.sotnSdwansitelanData]; //Table refresh
- console.log(this.sotnSdwansitelanData)
}
editSotnSdwansitelan(num, item, sotnSdwansitelanData) {
- console.log(item)
if (this.tabInputShowSdwansitelan[num - 1] == false) {
this.tabInputShowSdwansitelan[num - 1] = true;
} else {
this.tabInputShowSdwansitelan[num - 1] = false;
}
- console.log(sotnSdwansitelanData);
}
deleteSotnSdwansitelan(num, item, sotnSdwansitelanData) {
if (this.sotnSdwansitelanData.length <= 1) {
- console.log("num>=1", "sotnSdwansitelanData");
return false;
} else {
}
this.sotnSdwansitelanData = this.sotnSdwansitelanData.filter((d, i) => i !== num - 1);
- console.log(this.sotnSdwansitelanData)
}
//add,edit,delete SdwanDevice
@@ -286,26 +278,21 @@ export class CcvpnCreationComponent implements OnInit {
this.siteSdwanDevice[addNum] = inputsData;
this.tabInputShowDevice[addNum] = true;
this.siteSdwanDevice = [...this.siteSdwanDevice]; //表格刷新
- console.log(this.siteSdwanDevice)
}
editDevicePort(num, item, siteSdwanDevice) {
- console.log(item)
if (this.tabInputShowDevice[num - 1] == false) {
this.tabInputShowDevice[num - 1] = true;
} else {
this.tabInputShowDevice[num - 1] = false;
}
- console.log(siteSdwanDevice);
}
deleteDevicePort(num, item, siteSdwanDevice) {
if (this.siteSdwanDevice.length <= 1) {
- console.log("num>=1", "siteSdwanDevice");
return false;
}
this.siteSdwanDevice = this.siteSdwanDevice.filter((d, i) => i !== num - 1);
- console.log(this.siteSdwanDevice)
}
//add,edit,delete siteWanPort
@@ -323,24 +310,19 @@ export class CcvpnCreationComponent implements OnInit {
this.siteWanData[addNum] = inputsData;
this.tabInputShowWanPort[addNum] = true;
this.siteWanData = [...this.siteWanData]; //Table refresh
- console.log(this.siteWanData)
}
editWanPort(num, item, siteWanData) {
- console.log(item)
if (this.tabInputShowWanPort[num - 1] == false) {
this.tabInputShowWanPort[num - 1] = true;
} else {
this.tabInputShowWanPort[num - 1] = false;
}
- console.log(siteWanData);
}
deleteWanPort(num, item, siteWanData) {
if (this.siteWanData.length <= 1) {
- console.log("num>=1", "siteWanData");
return false;
}
this.siteWanData = this.siteWanData.filter((d, i) => i !== num - 1);
- console.log(this.siteWanData)
}
//siteModel,sotnVpnModel Display sign
@@ -362,11 +344,9 @@ export class CcvpnCreationComponent implements OnInit {
"sdwansitelan_list": []
};
inputs = Object.assign(inputs, this.sotnInfo);
- console.log(this.sotnInfo, "this.sotnInfo");
inputs["sdwansitelan_list"] = this.sotnSdwansitelanData.map((item) => {
return Object.assign({}, item);
});
- console.log(inputs);
if (this.isEditSotnVpn) {
// Edit status does not increase
this.sotnVpnTableData[this.isEditSotnVpn - 1] = inputs;
@@ -374,8 +354,6 @@ export class CcvpnCreationComponent implements OnInit {
} else {
this.sotnVpnTableData = [...this.sotnVpnTableData, inputs];
}
- console.log(this.sotnVpnTableData)
-
Object.keys(this.sotnInfo).forEach((item) => { //Clear modal box
this.sotnInfo[item] = null;
});
@@ -415,7 +393,6 @@ export class CcvpnCreationComponent implements OnInit {
editSotnVpn(num) {
this.sotnVpnModelShow = true;
this.isEditSotnVpn = num;
- console.log(this.templateParameters.sotnvpn.sdwanvpnresource_list)
Object.keys(this.sotnInfo).forEach((item) => { //Clear modal box
this.sotnInfo[item] = this.sotnVpnTableData[num - 1][item];
});
@@ -429,7 +406,6 @@ export class CcvpnCreationComponent implements OnInit {
deleteSotnVpn(num) {
this.sotnVpnTableData = this.sotnVpnTableData.filter((d, i) => i !== num - 1);
- console.log(this.sotnVpnTableData)
}
// addsite model
@@ -446,7 +422,6 @@ export class CcvpnCreationComponent implements OnInit {
inputs["sdwansitewan_list"] = this.siteWanData.map((item) => {
return Object.assign({}, item);
});
- console.log(inputs);
if (this.isEditSite) {
// Edit status does not increase
this.siteTableData[this.isEditSite - 1] = inputs;
@@ -536,7 +511,6 @@ export class CcvpnCreationComponent implements OnInit {
deleteSite(num) {
this.siteTableData = this.siteTableData.filter((d, i) => i !== num - 1);
- console.log(this.siteTableData)
this.drawImage(this.siteTableData);
}
@@ -690,9 +664,6 @@ export class CcvpnCreationComponent implements OnInit {
},
}
};
- console.log(this.bodyTemplateParameter)
- console.log(this.sotnVpnTableData, "before fixing")
- console.log(this.siteTableData, '"before fixing"')
let siteresource = null, sitewan = null, device = null, vpnresource = null, sitelan = null;
Object.keys(this.bodyTemplateParameter).map((item, index) => {
if (item.search("site") != -1) {
@@ -732,9 +703,6 @@ export class CcvpnCreationComponent implements OnInit {
}
});
});
- console.log(siteresource, sitewan, device, vpnresource, sitelan);
- console.log(this.sotnVpnTableData, "After modification")
- console.log(this.siteTableData, "After modification")
Object.keys(this.bodyTemplateParameter).map((item, index) => {
if (item.search("site") != -1) {
servicebody.service.parameters.requestInputs[item] = [].concat(this.siteTableData);
@@ -743,8 +711,6 @@ export class CcvpnCreationComponent implements OnInit {
servicebody.service.parameters.requestInputs[item] = [].concat(this.sotnVpnTableData);
}
});
- // servicebody.service.parameters.requestInputs.sdwanvpnresource_list = servicebody.service.parameters.requestInputs.sdwanvpnresource_list.concat(this.sotnVpnTableData);
- // servicebody.service.parameters.requestInputs.sdwansiteresource_list = servicebody.service.parameters.requestInputs.sdwansiteresource_list.concat(this.siteTableData);
console.log(servicebody);
this.closeCreate.emit(servicebody);