diff options
author | jin xin <j00101220@huawei.com> | 2016-11-01 06:38:15 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@open-o.org> | 2016-11-01 06:38:15 +0000 |
commit | 83981e7803e0be6909babadea960599efec8dfb5 (patch) | |
tree | 8c288390347e023d81b7087a4a61855088e1ebb1 /openo-portal/portal-resmgr/src/main | |
parent | 7eaafe9c63dc6b322360c05f12ec4b28b1b3f2d2 (diff) | |
parent | a9202771b7aaef66477ac25e8b89cd9efa5cc1c9 (diff) |
Merge "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." into sun
Diffstat (limited to 'openo-portal/portal-resmgr/src/main')
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/ne.html | 8 | ||||
-rw-r--r-- | openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/port.html | 18 |
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>
+ </label>
+ <div class="col-sm-7">
+ <input type="text" id="nativeID" name="nativeID" class="form-control"
+ placeholder="Native ID"/>
+ </div>
+ </div>
</div>
</div>
</div>
|