summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/components/e2e-creation
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2019-05-14 18:41:02 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2019-05-14 18:41:09 +0800
commitcd934c497a6bf26992bcb42e27a179479001658b (patch)
treeee5446472dc01cf1cca77ed1ab363a50bdbfba99 /usecaseui-portal/src/app/components/e2e-creation
parente044dfe80bcefb9004c8b6d3156d15ac56426dad (diff)
Fix instance instantiation for CCVPN
Change-Id: Ibf9be061fb6a461cd6c73ccf56a6afe72928157d Issue-ID: USECASEUI-220 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/components/e2e-creation')
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html6
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less12
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts12
3 files changed, 14 insertions, 16 deletions
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
index b2ec4401..5e9f8158 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
@@ -20,9 +20,7 @@
<h3 class="title fl">{{createParams.commonParams.templateType}} {{"i18nTextDefine_InstanceCreation" | translate}} </h3>
<div class="fl" style="width: 20%">
<button class="submit" nz-button (click)="submit()"><span> {{"i18nTextDefine_Create" | translate}} </span></button>
- <button class="back" nz-button (click)="goback()">
- <i class="anticon anticon-arrow-left" style="transform: scale(1.5)"></i>
- </button>
+ <button class="back" nz-button (click)="goback()"></button>
</div>
</div>
<div class="e2ecreate-content">
@@ -63,7 +61,7 @@
<h3>{{template.name}}</h3>
<ul>
<li *ngFor="let input of template.inputs; let i = index;">
- <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" title=" {{input.name}}"> {{input.name}}: </span>
+ <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" title="{{input.name}}"> {{input.name}}: </span>
<input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input
[(ngModel)]="input.value">
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less
index 1900f7d2..22c12fb7 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.less
@@ -52,21 +52,23 @@ hr {
background:linear-gradient(90deg, rgb(103, 207, 246) 0%, rgb(69, 175, 255) 100%) !important;
border: none;
}
- .back {
+ .back,.back:hover{
position: absolute;
top: 10px;
right: 20px;
display: inline-block;
width: 35px;
height: 35px;
- background:#ffffff!important;
+ background:url("../../../assets/images/Return-icon.png") no-repeat!important;
+ background-size: 100%!important;
border-radius:4px;
color: #D7D7D7;
+ cursor: pointer;
+ /*border: 1px solid #ffffff;*/
}
.back:hover{
- background:#ffffff;
- color: #3F9CFF;
- border:1px solid #3F9CFF;
+ background: url("../../../assets/images/Return-icon-active.png")!important;
+ background-size: 100%!important;
}
.top-title h3.title {
height: 35px;
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
index d5e1a3a0..dc8566e0 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
@@ -27,7 +27,7 @@ export class E2eCreationComponent implements OnInit {
constructor( private myhttp:MyhttpService ) { }
ngOnInit() {
- this.getTemParameters();
+ this.gete2eTemParameters(this.e2e_ns_temParametersContent);
this.getVimInfo();
this.getSdnControllers();
console.log(this.createParams);
@@ -36,6 +36,7 @@ export class E2eCreationComponent implements OnInit {
@Output() e2eCloseCreate = new EventEmitter();
@Output() nsCloseCreate = new EventEmitter();
@Input() createParams;
+ @Input() e2e_ns_temParametersContent;
// e2e serviceTemplateParameters
@@ -75,12 +76,10 @@ export class E2eCreationComponent implements OnInit {
'2': './assets/images/create-ns.png',
'3': './assets/images/create-vnf.png',
};
- getTemParameters(){ //Get template parameters
+ gete2eTemParameters(data) { //Get template parameters
let type = this.createParams.commonParams.templateType == "E2E Service" ? "e2e" : "ns";
- this.myhttp.getTemplateParameters(type,this.createParams.template)
- .subscribe((data)=>{
- // console.log(this.createParams);
- // console.log(data);
+ console.log(this.createParams);
+ console.log(data);
if(type == "e2e"){
this.templateParameters = data;
this.templateParameters.nestedTemplates.forEach((item)=>{
@@ -124,7 +123,6 @@ export class E2eCreationComponent implements OnInit {
this.drawImage(type)
- })
}
vimInfos=[];
getVimInfo() {