X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNG-UI.git;a=blobdiff_plain;f=src%2Fapp%2Fpackages%2Fns-packages%2Fns-composer%2FNSComposerComponent.html;h=c4ec96d01d2cd1aefc8a60c3a84ecdda4cb770ab;hp=4e78c160531d560b0c17f91445884c2e893f423b;hb=43dec1560d59d84cbc5d9290549ac987f1c285ce;hpb=509ed1c0d1d700122cb799671548cbd2384c9e07

diff --git a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html
index 4e78c16..c4ec96d 100644
--- a/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html
+++ b/src/app/packages/ns-packages/ns-composer/NSComposerComponent.html
@@ -33,45 +33,38 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
           <div class="col-12 p-0">
             <form autocomplete="off">
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ 'SHORTNAME' | translate }}</label>
+                <label class="col-sm-4 col-form-label">{{ 'ID' | translate }}</label>
                 <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'SHORTNAME' | translate }}" name="shortName"
-                    [(ngModel)]="vnfdPackageDetails.shortName">
+                  <input type="text" class="form-control" placeholder="{{ 'ID' | translate }}" name="id"
+                    [(ngModel)]="nsPackageDetails.id">
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ 'VENDOR' | translate }}</label>
+                <label class="col-sm-4 col-form-label">{{ 'NAME' | translate }}</label>
                 <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'VENDOR' | translate }}" name="vendor"
-                    [(ngModel)]="vnfdPackageDetails.vendor">
+                  <input type="text" class="form-control" placeholder="{{ 'NAME' | translate }}" name="name"
+                    [(ngModel)]="nsPackageDetails.name">
                 </div>
               </div>
               <div class="form-group row">
                 <label class="col-sm-4 col-form-label">{{ 'DESCRIPTION' | translate }}</label>
                 <div class="col-sm-8 p-0">
-                  <textarea type="text" class="form-control" placeholder="{{ 'DESCRIPTION' | translate }}"
-                    name="description" [(ngModel)]="vnfdPackageDetails.description"></textarea>
+                  <textarea rows="5" cols="50" class="form-control" placeholder="{{ 'DESCRIPTION' | translate }}"
+                    name="description" [(ngModel)]="nsPackageDetails.description"></textarea>
                 </div>
               </div>
               <div class="form-group row">
                 <label class="col-sm-4 col-form-label">{{ 'VERSION' | translate }}</label>
                 <div class="col-sm-8 p-0">
                   <input type="text" class="form-control" placeholder="{{ 'VERSION' | translate }}" name="version"
-                    [(ngModel)]="vnfdPackageDetails.version">
+                    [(ngModel)]="nsPackageDetails.version">
                 </div>
               </div>
               <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ 'ID' | translate }}</label>
+                <label class="col-sm-4 col-form-label">{{ 'DESIGNER' | translate }}</label>
                 <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'ID' | translate }}" name="id"
-                    [(ngModel)]="vnfdPackageDetails.id">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-4 col-form-label">{{ 'NAME' | translate }}</label>
-                <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'NAME' | translate }}" name="name"
-                    [(ngModel)]="vnfdPackageDetails.name">
+                  <input type="text" class="form-control" placeholder="{{ 'DESIGNER' | translate }}" name="designer"
+                    [(ngModel)]="nsPackageDetails.designer">
                 </div>
               </div>
               <button type="button" class="btn btn-primary" (click)="saveNSD()" placement="top"
@@ -87,43 +80,23 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
           <div class="col-12 p-0">
             <form autocomplete="off">
               <div class="form-group row">
-                <label class="col-sm-4 p-0 col-form-label">{{ 'NAME' | translate }}</label>
+                <label class="col-sm-4 p-0 col-form-label">{{ 'ID' | translate }}</label>
                 <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'NAME' | translate }}" name="name"
-                    [(ngModel)]="vlDetails.name">
+                  <input type="text" readonly class="form-control" placeholder="{{ 'ID' | translate }}" name="id"
+                    [(ngModel)]="virtualLinkDesc.id">
                 </div>
               </div>
               <div class="form-group row">
                 <label class="col-sm-4 p-0 col-form-label">{{'PAGE.NSPACKAGE.NSCOMPOSE.MGMTNETWORK' | translate}}</label>
                 <div class="col-sm-8 p-0">
-                  <select class="form-control custom-select" name="mgmt-network" [(ngModel)]="vlDetails['mgmt-network']">
+                  <select class="form-control custom-select" name="mgmt-network" [(ngModel)]="virtualLinkDesc['mgmt-network']">
                     <option [value]="true">True</option>
                     <option [value]="false">False</option>
                   </select>
                 </div>
               </div>
-              <div class="form-group row">
-                <label class="col-sm-4 p-0 col-form-label">{{'PAGE.NSPACKAGE.NSCOMPOSE.VIMNETWORKNAME' | translate}}</label>
-                <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="Vim network name" name="vim-network-name"
-                    [(ngModel)]="vlDetails['vim-network-name']">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-4 p-0 col-form-label">{{'TYPE' | translate}}</label>
-                <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="Type" name="type" [(ngModel)]="vlDetails.type">
-                </div>
-              </div>
-              <div class="form-group row">
-                <label class="col-sm-4 p-0 col-form-label">{{ 'ID' | translate }}</label>
-                <div class="col-sm-8 p-0">
-                  <input type="text" class="form-control" placeholder="{{ 'ID' | translate }}" name="id"
-                    [(ngModel)]="vlDetails.id">
-                </div>
-              </div>
               <button type="button" class="btn btn-primary" placement="top" ngbTooltip="Save"
-                (click)="saveVL(vlDetails.id)">
+                (click)="saveVL(virtualLinkDesc.id)">
                 <i class="fas fa-save"></i> {{'SAVE' | translate}}
               </button>
             </form>
@@ -136,12 +109,12 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
             <table class="table table-bordered text-dark custom-table">
               <tbody>
                 <tr>
-                  <td>{{'PAGE.NSPACKAGE.NSCOMPOSE.MEMBER-VNF-INDEX' | translate}}</td>
-                  <td>{{ vnfData['member-vnf-index'] }}</td>
+                  <th scope="row">id</th>
+                  <td>{{ vnfData.id }}</td>
                 </tr>
                 <tr>
-                  <td>{{'PAGE.NSPACKAGE.NSCOMPOSE.VNFD-ID-REF' | translate}}</td>
-                  <td>{{ vnfData['vnfd-id-ref'] }}</td>
+                  <th scope="row">vnfd-id</th>
+                  <td>{{ vnfData['vnfd-id'] }}</td>
                 </tr>
               </tbody>
             </table>
@@ -154,20 +127,24 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
             <table class="table table-bordered text-dark custom-table">
               <tbody>
                 <tr>
-                  <td>{{'PAGE.NSPACKAGE.NSCOMPOSE.VLD-ID' | translate}}</td>
-                  <td>{{ vlDetails['name'] }}</td>
+                  <th scope="row">id</th>
+                  <td>{{ vnfData.id }}</td>
+                </tr>
+                <tr>
+                  <th scope="row">vnfd-id</th>
+                  <td>{{ vnfData['vnfd-id'] }}</td>
                 </tr>
                 <tr>
-                  <td>{{'PAGE.NSPACKAGE.NSCOMPOSE.VNFD-CP-REF' | translate}}</td>
-                  <td>{{ cpData['vnfd-connection-point-ref'] }}</td>
+                  <th scope="row">constituent-base-element-id</th>
+                  <td>{{ cpData['constituent-base-element-id'] }}</td>
                 </tr>
                 <tr>
-                  <td>{{'MEMBERINDEX' | translate}}</td>
-                  <td>{{ cpData['member-vnf-index-ref'] }}</td>
+                  <th scope="row">constituent-cpd-id</th>
+                  <td>{{ cpData['constituent-cpd-id'] }}</td>
                 </tr>
                 <tr>
-                  <td>{{'PAGE.NSPACKAGE.NSCOMPOSE.VNFD-ID-REF' | translate}}</td>
-                  <td>{{ cpData['vnfd-id-ref'] }}</td>
+                  <th scope="row">virtual-link-profile-id</th>
+                  <td>{{ virtualLinkProfileID }}</td>
                 </tr>
               </tbody>
             </table>
@@ -211,9 +188,9 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
             <ul class="list-group list-group-flush dragable scroll-box">
               <li id="list['id']" class="list-group-item" draggable="true" (dragstart)="drag($event)"
                 [attr.data-id]="list['id']" *ngFor="let list of vnfList" placement="top"
-              container="body" ngbTooltip="{{ list['short-name'] }}">
+              container="body" ngbTooltip="{{ list['product-name'] }}">
                 <img src="assets/images/VNFD.svg" class="ns-svg" draggable="false"/>
-                &nbsp;<span class="span-overflow-text font-weight-bold">{{ list['short-name'] }}</span>
+                &nbsp;<span class="span-overflow-text font-weight-bold">{{ list['product-name'] }}</span>
                 <span class="drag-icon pull-right"><i class="fas fa-arrows-alt"></i></span>
               </li>
             </ul>