From: Barath Kumar R <barath.r@tataelxsi.co.in>
Date: Thu, 17 Dec 2020 14:45:53 +0000 (+0530)
Subject: Bug 1381 SDN controller details pop-up doesn't show some attributes
X-Git-Tag: v9.1.0~4
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=c0875180d63cc022f54ecda360b4ed090b37117f;p=osm%2FNG-UI.git

Bug 1381 SDN controller details pop-up doesn't show some attributes

 * Modified the UI to show the IP and port as URL

Change-Id: Ia6aa9a86c736f96bd3c42bb25f28d0e77b092083
Signed-off-by: Barath Kumar R <barath.r@tataelxsi.co.in>
---

diff --git a/src/app/sdn-controller/sdn-controller-details/SDNControllerDetailsComponent.ts b/src/app/sdn-controller/sdn-controller-details/SDNControllerDetailsComponent.ts
index 125d0f4..589f13e 100644
--- a/src/app/sdn-controller/sdn-controller-details/SDNControllerDetailsComponent.ts
+++ b/src/app/sdn-controller/sdn-controller-details/SDNControllerDetailsComponent.ts
@@ -172,8 +172,7 @@ export class SDNControllerDetailsComponent implements OnInit, OnDestroy {
                     }
                 }
             },
-            ip: { title: this.translateService.instant('IP'), width: '15%' },
-            port: { title: this.translateService.instant('PORT'), width: '15%' },
+            url: { title: this.translateService.instant('URL'), width: '30%' },
             Actions: {
                 name: 'Action', width: '5%', filter: false, sort: false, type: 'custom',
                 title: this.translateService.instant('ACTIONS'),
@@ -201,8 +200,7 @@ export class SDNControllerDetailsComponent implements OnInit, OnDestroy {
             identifier: sdn._id,
             type: sdn.type,
             operationalState: sdn._admin.operationalState,
-            ip: sdn.ip,
-            port: sdn.port
+            url: sdn.url
         };
     }
 
diff --git a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html
index 28739cf..d89ad24 100644
--- a/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html
+++ b/src/app/sdn-controller/sdn-controller-info/SDNControllerInfoComponent.html
@@ -16,75 +16,111 @@ limitations under the License.
 Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.in), BARATH KUMAR R (barath.r@tataelxsi.co.in)
 -->
 <div class="modal-header">
-  <h4 class="modal-title" id="modal-basic-title">{{'PAGE.SDNCONTROLLER.DETAILS' | translate}}</h4>
-  <button class="button-xs" type="button" class="close" aria-label="Close" (click)="activeModal.close()">
-    <i class="fas fa-times-circle text-danger"></i>
-  </button>
+    <h4 class="modal-title" id="modal-basic-title">{{'PAGE.SDNCONTROLLER.DETAILS' | translate}}</h4>
+    <button class="button-xs" type="button" class="close" aria-label="Close" (click)="activeModal.close()">
+        <i class="fas fa-times-circle text-danger"></i>
+    </button>
 </div>
 <div class="modal-body modal-body-custom-height p-0">
-  <table class="table table-striped table-layout-fixed mb-0" *ngIf="sdnDetails else noData">
-    <tr>
-      <td colspan="2">
-        <b>{{'ID' | translate}}:</b> {{(sdnDetails._id)?sdnDetails._id:''}}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <b>{{'OPERATIONALSTATE' | translate}}:</b>
-        <span class="badge ml-1" [ngClass]="{'badge-warning text-white':sdnDetails._admin.operationalState === operationalStateFirstStep,
+    <table class="table table-sm table-hover table-layout-fixed mb-0" *ngIf="sdnDetails else noData">
+        <tbody>
+            <tr>
+                <th>
+                    {{'ID' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails._id)?sdnDetails._id:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'NAME' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.name)?sdnDetails.name:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'TYPE' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.type)?sdnDetails.type:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'OPERATIONALSTATE' | translate}}
+                </th>
+                <td>
+                    <span class="badge ml-1" [ngClass]="{'badge-warning text-white':sdnDetails._admin.operationalState === operationalStateFirstStep,
           'badge-success':sdnDetails._admin.operationalState === operationalStateSecondStep,
           'badge-danger':sdnDetails._admin.operationalState === operationalStateThirdStep}">
-          {{(sdnDetails._admin.operationalState)?sdnDetails._admin.operationalState:''}}</span>
-      </td>
-      <td>
-        <b>{{'IP' | translate}}:</b> {{(sdnDetails.ip)?sdnDetails.ip:''}}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <b>{{'NAME' | translate}}:</b> {{(sdnDetails.name)?sdnDetails.name:''}}
-      </td>
-      <td>
-        <b>{{'PORT' | translate}}:</b> {{(sdnDetails.port)?sdnDetails.port:''}}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <b>{{'TYPE' | translate}}:</b> {{(sdnDetails.type)?sdnDetails.type:''}}
-      </td>
-      <td>
-        <b>{{'VERSION' | translate}}:</b> {{(sdnDetails.version)?sdnDetails.version:''}}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <b>{{'USER' | translate}}:</b> {{(sdnDetails.user)?sdnDetails.user:''}}
-      </td>
-      <td>
-        <b>{{'CREATED' | translate}}:</b>
-        {{(sdnDetails._admin.created)?this.sharedService.convertEpochTime(sdnDetails._admin.created):''}}
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <b>{{'PAGE.SDNCONTROLLER.DPID' | translate}}:</b> {{(sdnDetails.dpid)?sdnDetails.dpid:''}}
-      </td>
-      <td>
-        <b>{{'MODIFIED' | translate}}:</b>
-        {{(sdnDetails._admin.modified)?this.sharedService.convertEpochTime(sdnDetails._admin.modified):''}}
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        <b>{{'DEPLOYED' | translate}}</b> <br>
-        <b>{{'PAGE.SDNCONTROLLER.RO' | translate}}:</b> {{(sdnDetails._admin.deployed.RO)?sdnDetails._admin.deployed.RO:''}}
-        <br>
-      </td>
-    </tr>
-  </table>
-  <ng-template #noData>{{'NODATAERROR' | translate}}</ng-template>
+                        {{(sdnDetails._admin.operationalState)?sdnDetails._admin.operationalState:'-'}}</span>
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'URL' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.url)?sdnDetails.url:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'USER' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.user)?sdnDetails.user:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'VERSION' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.version)?sdnDetails.version:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'PAGE.SDNCONTROLLER.DPID' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails.dpid)?sdnDetails.dpid:'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'CREATED' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails._admin.created)?this.sharedService.convertEpochTime(sdnDetails._admin.created):'-'}}
+                </td>
+            </tr>
+            <tr>
+                <th>
+                    {{'MODIFIED' | translate}}
+                </th>
+                <td>
+                    {{(sdnDetails._admin.modified)?this.sharedService.convertEpochTime(sdnDetails._admin.modified):'-'}}
+                </td>
+            </tr>
+        </tbody>
+        <tr>
+            <th>
+                {{'DEPLOYED' | translate}}
+            </th>
+            <td>
+                <b>{{'PAGE.SDNCONTROLLER.RO' | translate}}:</b>
+                {{(sdnDetails._admin.deployed.RO)?sdnDetails._admin.deployed.RO:'-'}}
+            </td>
+        </tr>
+    </table>
+    <ng-template #noData>{{'NODATAERROR' | translate}}</ng-template>
 </div>
 <div class="modal-footer">
-  <button (click)="activeModal.close()" class="btn btn-danger">{{'CANCEL' | translate}}</button>
+    <button (click)="activeModal.close()" class="btn btn-danger">{{'CANCEL' | translate}}</button>
 </div>
 <app-loader [waitingMessage]="message" *ngIf="isLoadingResults"></app-loader>
\ No newline at end of file
diff --git a/src/models/SDNControllerModel.ts b/src/models/SDNControllerModel.ts
index 2b5ab87..4aa0aed 100644
--- a/src/models/SDNControllerModel.ts
+++ b/src/models/SDNControllerModel.ts
@@ -22,16 +22,15 @@
 /** Interface for SDNControllerModel */
 export interface SDNControllerModel {
     dpid: string;
-    ip: string;
     name: string;
     password: string;
-    port: string;
     schema_version: string;
     'type': string;
     user: string;
     version: string;
     _admin: ADMIN;
     _id: string;
+    url:string;
 }
 
 /** Interface for _ADMIN */
@@ -70,6 +69,5 @@ export interface SDNControllerList {
     identifier: string;
     'type': string;
     operationalState: string;
-    ip: string;
-    port: string;
+    url: string;
 }