You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by oc...@apache.org on 2021/02/08 18:15:42 UTC
[trafficcontrol] branch master updated: Renaming TP server columns
for IPv4 address fields (#5501)
This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new a724b60 Renaming TP server columns for IPv4 address fields (#5501)
a724b60 is described below
commit a724b60bb0d586d908a2599a316c19044e6ec7b5
Author: Rima Shah <22...@users.noreply.github.com>
AuthorDate: Mon Feb 8 11:15:27 2021 -0700
Renaming TP server columns for IPv4 address fields (#5501)
* Name change for Ipv4 fields
* Removed changes from .ep file
* Updated Changelog
* Fixed indentation
* Fixed indentation-1
---
CHANGELOG.md | 1 +
docs/source/admin/traffic_portal/usingtrafficportal.rst | 6 +++---
.../app/components/servers/servers-table/servers-table.component.ts | 6 +++---
.../app/src/common/modules/table/servers/TableServersController.js | 6 +++---
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cd6e29..d0ac73d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
## [unreleased]
### Added
+- Traffic Portal: [#5318](https://github.com/apache/trafficcontrol/issues/5318) - Rename server columns for IPv4 address fields.
- Traffic Portal: [#5361](https://github.com/apache/trafficcontrol/issues/5361) - Added the ability to change the name of a topology.
- Traffic Portal: [#5340](https://github.com/apache/trafficcontrol/issues/5340) - Added the ability to resend a user registration from user screen.
- Traffic Portal: [#5394](https://github.com/apache/trafficcontrol/issues/5394) - Converts the tenant table to a tenant tree for usability
diff --git a/docs/source/admin/traffic_portal/usingtrafficportal.rst b/docs/source/admin/traffic_portal/usingtrafficportal.rst
index f91ff63..7a5ba96 100644
--- a/docs/source/admin/traffic_portal/usingtrafficportal.rst
+++ b/docs/source/admin/traffic_portal/usingtrafficportal.rst
@@ -388,10 +388,10 @@ Use the `Quick Search` to search across all table columns or the column filter t
:Mgmt IP Address: The IPv4 address of some network interface on the server used for 'management'
:Mgmt IP Gateway: The IPv4 address of a gateway used by some network interface on the server used for 'management'
:Mgmt IP Netmask: The IPv4 subnet mask used by some network interface on the server used for 'management'
-:Network Gateway: The IPv4 address of the gateway used by ``interfaceName``
-:Network IP: [Visible by default] The IPv4 address of ``interfaceName``
+:IPv4 Gateway: The IPv4 address of the gateway used by ``interfaceName``
+:IPv4 Address: [Visible by default] The IPv4 address of ``interfaceName``
:Network MTU: The Maximum Transmission Unit (MTU) to configured on ``interfaceName``
-:Network Subnet: The IPv4 subnet mask used by ``interfaceName``
+:IPv4 Subnet: The IPv4 subnet mask used by ``interfaceName``
:Offline Reason: A user-entered reason why the server is in ADMIN_DOWN or OFFLINE status
:Phys Location: The name of the physical location where the server resides
:Profile: [Visible by default] The :ref:`profile-name` of the :term:`Profile` used by this server
diff --git a/experimental/traffic-portal/src/app/components/servers/servers-table/servers-table.component.ts b/experimental/traffic-portal/src/app/components/servers/servers-table/servers-table.component.ts
index 82234fa..d4b6a3c 100644
--- a/experimental/traffic-portal/src/app/components/servers/servers-table/servers-table.component.ts
+++ b/experimental/traffic-portal/src/app/components/servers/servers-table/servers-table.component.ts
@@ -155,7 +155,7 @@ export class ServersTableComponent implements OnInit, OnDestroy {
cellRenderer: "sshCellRenderer",
field: "ipGateway",
filter: true,
- headerName: "Network Gateway",
+ headerName: "IPv4 Gateway",
hide: true,
onCellClicked: null
},
@@ -163,7 +163,7 @@ export class ServersTableComponent implements OnInit, OnDestroy {
cellRenderer: "sshCellRenderer",
field: "ipv4Address",
filter: true,
- headerName: "Network IP",
+ headerName: "IPv4 Address",
hide: false,
onCellClicked: null
},
@@ -175,7 +175,7 @@ export class ServersTableComponent implements OnInit, OnDestroy {
},
{
field: "ipNetmask",
- headerName: "Network Subnet",
+ headerName: "IPv4 Subnet",
hide: true
},
{
diff --git a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
index 21246e7..3ac1fda 100644
--- a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
+++ b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js
@@ -160,7 +160,7 @@ var TableServersController = function(tableName, servers, filter, $scope, $state
onCellClicked: null
},
{
- headerName: "Network Gateway",
+ headerName: "IPv4 Gateway",
field: "ipGateway",
hide: true,
filter: true,
@@ -168,7 +168,7 @@ var TableServersController = function(tableName, servers, filter, $scope, $state
onCellClicked: null
},
{
- headerName: "Network IP",
+ headerName: "IPv4 Address",
field: "ipAddress",
hide: false,
filter: true,
@@ -182,7 +182,7 @@ var TableServersController = function(tableName, servers, filter, $scope, $state
filter: "agNumberColumnFilter"
},
{
- headerName: "Network Subnet",
+ headerName: "IPv4 Subnet",
field: "ipNetmask",
hide: true
},