Fix instance instantiation for NS/E2E

Change-Id: Icce9c332b740ad7aa44f4e84f9274778542ebced
Issue-ID: USECASEUI-131
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

4 files changed, 24 insertions, 17 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 79b3e371..10bcba1d 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
@@ -25,6 +25,7 @@
             </button>
         </div>
     </div>
+    <div class="e2ecreate-content">
     <div class="creation fl">
         <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix">
             <!--2019.02.21 add-->
@@ -128,7 +129,7 @@
             </div>
         </div>
     </div>
-
+        <div class="dividing-line fl"></div>
     <!-- chart -->
     <div class="chart fr">
         <div id="createChart">
@@ -139,6 +140,7 @@
 
             </svg>
 
+            </div>
         </div>
     </div>
 
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 c2b441cd..79e952f4 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
@@ -79,16 +79,22 @@ hr {
         /*top:10px;*/
 
     }
+    .e2ecreate-content{
+        position: relative;
+        width: 98%;
+        height: 100%;
+        margin-left: 30px;
+        box-shadow:0px 10px 15px 2px rgba(222,222,222,0.5);
+        background: #fff;
+        border-radius:2px;
+    }
     .creation{
         position: relative;
         width: 58%;
         height: 100%;
         overflow-y: auto;
-        border-radius: 5px;
         padding: 20px;
         background: #fff;
-        margin-left: 30px;
-        box-shadow:0px 10px 15px 2px rgba(222,222,222,0.5);
         .baseparms {
             h3 {
                 color: #06A7E2;
@@ -112,7 +118,6 @@ hr {
                 margin-left: 30px;
             }
             ul li {
-                // display: inline-block;
                 margin: 10px 0;
                 width: 40%;
                 float: left;
@@ -132,17 +137,17 @@ hr {
             }
         }
     }
+    .dividing-line{
+        width: 0;
+        height: 85%;
+        margin: 4% 0;
+        border-left: 1px #cccccc dashed;
+    }
     .chart {
-        width: 35%;
+        width: 38%;
         padding: 10px;
         height: 95%;
-        box-shadow: 0px 10px 35px 10px rgba(222, 222, 222, 0.5);
         margin-right: 40px;
-        //background: url("../../../assets/images/ccvpn-createbanner2.png") no-repeat -45px -10px;
-        //background-size: 110% 110%;
-        background:linear-gradient(180deg,rgba(183, 230, 247, 1) 0%,rgba(214, 240, 254, 1) 100%);
-        //background-color: rgba(188, 231, 248, 1);
-        border-radius: 4px;
         #createChart{
             height: 100%;
             width: 100%;
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 b025e880..a1db49b9 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
@@ -30,7 +30,6 @@ export class E2eCreationComponent implements OnInit {
     this.getTemParameters();
     this.getVimInfo();
     this.getSdnControllers();
-    // this.drawImage("e2e");
     console.log(this.createParams);
   }
 
@@ -208,7 +207,8 @@ export class E2eCreationComponent implements OnInit {
             let location = {
               vnfProfileId: input.name,
               locationConstraints:{
-                vimId: input.value.name + "_" + input.value.id,
+                                cloudOwner: input.value.name,
+                                cloudRegionId:input.value.id
               }
             }
             nsService.parameters.locationConstraints.push(location);
@@ -237,7 +237,8 @@ export class E2eCreationComponent implements OnInit {
         let vnfparams = {
           vnfProfileId: vnf.properties.id,
           locationConstraints: {
-            vimId: vnf.value.name + "_" + vnf.value.id,
+                        cloudOwner: vnf.value.name,
+                        cloudRegionId:vnf.value.id
           }
         }
         this.ns_service2.locationConstraints.push(vnfparams);
@@ -277,7 +278,6 @@ export class E2eCreationComponent implements OnInit {
             .projection(function (d) {
                 return [d.x-18, d.y+40];
             });
-        console.log(diagonal)
         var svg = d3.select("svg");
 
         //marker
diff --git a/usecaseui-portal/src/styles.less b/usecaseui-portal/src/styles.less
index 86c5b08f..d4d7f1f8 100644
--- a/usecaseui-portal/src/styles.less
+++ b/usecaseui-portal/src/styles.less
@@ -406,7 +406,7 @@ nz-modal .serviceCreationModel.ant-modal,nz-modal .deleteModel.ant-modal, nz-mod
     background: #fff;
     padding: 0;
     .ant-tabs-tabpane {
-      height: 400px;
+      height: 380px;
       background: #fff;
       border-radius: 0px 0px 4px 4px;
       border: 1px solid rgba(13, 169, 226, 0.8);