Port of the Resource Manager SDNO does not include the Native ID and hence query of the Port is not related.

Also remove the fields of the NE that are not returned by query all.

SDNO-832

Change-Id: I1895f7ab32d3df74f37b970b5372fe2a801deb68
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

2 files changed, 22 insertions, 4 deletions

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
index 518da3ee..8eff1cd5 100644
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html
@@ -132,7 +132,7 @@
                                             </span>

                                 </div>

                             </th>

-                            <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

+                       <!-- <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

                                 data-field="controller" data-sortable="true" data-filter-control="input">

                                 <div class="openo-table-th-border"></div>

                                 <div class="DataTables_sort_wrapper openo-ellipsis ">

@@ -140,7 +140,7 @@
                                                   class="openo-table-th-sorticon overflow_elip  leftHeaderAlign  openo-table-disable-element ">Controller

                                             </span>

                                 </div>

-                            </th>

+                            </th> -->

                             <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

                                 data-field="nativeID" data-sortable="true" data-filter-control="input">

                                 <div class="openo-table-th-border"></div>

@@ -159,7 +159,7 @@
                                             </span>

                                 </div>

                             </th>

-                            <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

+                        <!--    <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

                                 data-field="neRole" data-sortable="true" data-filter-control="input">

                                 <div class="openo-table-th-border"></div>

                                 <div class="DataTables_sort_wrapper openo-ellipsis ">

@@ -185,7 +185,7 @@
                                                   class="openo-table-th-sorticon overflow_elip  leftHeaderAlign  openo-table-disable-element ">Operating State

                                             </span>

                                 </div>

-                            </th>

+                            </th> -->

                             <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

                                 align="center" data-formatter="operateFormatter" data-events="operateEvents">

                                 <div class="openo-table-th-border"></div>

diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
index ba0d5ec2..dbed9f8d 100644
--- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
+++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html
@@ -167,6 +167,15 @@
                             </div>

                         </th>

                         <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

+                                data-field="nativeID" data-sortable="true" data-filter-control="input">

+                                <div class="openo-table-th-border"></div>

+                                <div class="DataTables_sort_wrapper openo-ellipsis ">

+                                            <span id="native_Id"

+                                                  class="openo-table-th-sorticon overflow_elip  leftHeaderAlign  openo-table-disable-element ">Native ID

+                                            </span>

+                                </div>

+                        </th>						

+                        <th class="openo-table-state-default openo-table-th openo-table-disable-element  leftHeaderAlign"

                             data-field="adminState" data-sortable="true" data-filter-control="input">

                             <div class="openo-table-th-border"></div>

                             <div class="DataTables_sort_wrapper openo-ellipsis ">

@@ -330,6 +339,15 @@
                                                    placeholder="255.255.255.255"/>

                                         </div>

                                     </div>

+                                    <div class="form-group">

+                                            <label class="col-sm-3 control-label">

+                                                <span>Native ID</span>&nbsp;&nbsp;&nbsp;

+                                            </label>

+                                            <div class="col-sm-7">

+                                                <input type="text" id="nativeID" name="nativeID" class="form-control"

+                                                       placeholder="Native ID"/>

+                                            </div>

+                                    </div>

                                 </div>

                             </div>

                         </div>