diff --git a/traffic_portal/app/src/common/api/ServerService.js b/traffic_portal/app/src/common/api/ServerService.js index 4f70fdba33..d44c163c3a 100644 --- a/traffic_portal/app/src/common/api/ServerService.js +++ b/traffic_portal/app/src/common/api/ServerService.js @@ -30,26 +30,12 @@ var ServerService = function($http, locationUtils, messageModel, ENV) { ) }; - this.getServer = function(id) { - return $http.get(ENV.api['root'] + 'servers', {params: {id: id}}).then( - function (result) { - return result.data.response[0]; - }, - function (err) { - throw err; - } - ) - }; - this.createServer = function(server) { return $http.post(ENV.api['root'] + 'servers', server).then( function(result) { - messageModel.setMessages([ { level: 'success', text: 'Server created' } ], true); - locationUtils.navigateToPath('/servers'); return result; }, function(err) { - messageModel.setMessages(err.data.alerts, false); throw err; } ); @@ -59,11 +45,9 @@ var ServerService = function($http, locationUtils, messageModel, ENV) { this.updateServer = function(server) { return $http.put(ENV.api['root'] + 'servers/' + server.id, server).then( function(result) { - messageModel.setMessages([ { level: 'success', text: 'Server updated' } ], false); return result; }, function(err) { - messageModel.setMessages(err.data.alerts, false); throw err; } ); diff --git a/traffic_portal/app/src/common/modules/form/_form.scss b/traffic_portal/app/src/common/modules/form/_form.scss index 984e6fcf6f..7879e4d366 100644 --- a/traffic_portal/app/src/common/modules/form/_form.scss +++ b/traffic_portal/app/src/common/modules/form/_form.scss @@ -40,6 +40,63 @@ } } +/* Shim for forms without bootstrap */ +.has-error { + color: #a94442; + + input, select, textarea { + box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075); + } +} + +.bordered-item { + border-bottom: 1px solid gray; + padding-bottom: 5px; + margin-bottom: 5px; +} + +button.right-button { + float: right; +} + +.form-control-columns { + display: grid; + grid-template-columns: 16.66666667% auto; + grid-row-gap: 15px; + + label { + text-align: right; + padding-right: 2em; + line-height: 2.4; + } + + fieldset { + grid-column: 2; + + div, li { + display: grid; + grid-template-columns: auto 1fr; + } + + div { + grid-column-gap: 20px; + } + + li { + grid-column-gap: 10px; + } + + small.input-error { + grid-column: 2; + } + + input[type="checkbox"] { + align-self: center; + justify-self: start; + } + } +} + .btn-link.request-status { font-size: 20px; color: #cd1323; @@ -79,6 +136,7 @@ form label.has-tooltip { width: max-content; max-width: inherit; cursor: auto; + line-height: 1.428; } } diff --git a/traffic_portal/app/src/common/modules/form/server/FormServerController.js b/traffic_portal/app/src/common/modules/form/server/FormServerController.js index 2a394f6f9b..8cb428fce4 100644 --- a/traffic_portal/app/src/common/modules/form/server/FormServerController.js +++ b/traffic_portal/app/src/common/modules/form/server/FormServerController.js @@ -19,6 +19,10 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal, formUtils, locationUtils, serverUtils, serverService, cacheGroupService, cdnService, physLocationService, profileService, typeService, messageModel, propertiesModel) { + $scope.IPPattern = serverUtils.IPPattern; + $scope.IPWithCIDRPattern = serverUtils.IPWithCIDRPattern; + $scope.IPv4Pattern = serverUtils.IPv4Pattern; + var getPhysLocations = function() { physLocationService.getPhysLocations() .then(function(result) { @@ -73,11 +77,6 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal $state.reload(); // reloads all the resolves for the view }; - // supposedly matches IPv4 and IPv6 formats. but actually need one that matches each. todo. - $scope.validations = { - ipRegex: new RegExp(/^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z]|[A-Za-z][A-Za-z0-9\-]*[A-Za-z0-9])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$/) - }; - $scope.server = server; $scope.falseTrue = [ @@ -95,6 +94,47 @@ var FormServerController = function(server, $scope, $location, $state, $uibModal $scope.showChartsButton = propertiesModel.properties.servers.charts.show; + $scope.addIP = function(interface) { + $scope.serverForm.$setDirty(); + const newIP = { + address: "", + gateway: null, + serviceAddress: false + }; + + if (!interface.ipAddresses) { + interface.ipAddresses = [newIP]; + } else { + interface.ipAddresses.push(newIP); + } + } + + $scope.deleteIP = function(interface, ip) { + $scope.serverForm.$setDirty(); + interface.ipAddresses.splice(interface.ipAddresses.indexOf(ip), 1); + } + + $scope.addInterface = function() { + $scope.serverForm.$setDirty(); + const newInf = { + mtu: 1500, + maxBandwidth: null, + monitor: false, + ipAddresses: [] + }; + + if (!$scope.server.interfaces) { + $scope.server.interfaces = [newInf]; + } else { + $scope.server.interfaces.push(newInf); + } + } + + $scope.deleteInterface = function(interface) { + $scope.serverForm.$setDirty(); + $scope.server.interfaces.splice($scope.server.interfaces.indexOf(interface, 1)); + } + $scope.onCDNChange = function() { $scope.server.profileId = null; // the cdn of the server changed, so we need to blank out the selected server profile (if any) getProfiles($scope.server.cdnId); // and get a new list of profiles (for the selected cdn) diff --git a/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js b/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js index ef181daf73..7fe181cbb5 100644 --- a/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js +++ b/traffic_portal/app/src/common/modules/form/server/edit/FormEditServerController.js @@ -17,10 +17,10 @@ * under the License. */ -var FormEditServerController = function(server, $scope, $controller, $uibModal, locationUtils, serverService, statusService, messageModel) { +var FormEditServerController = function(server, $anchorScroll, $scope, $controller, $uibModal, locationUtils, serverService, statusService, messageModel) { // extends the FormServerController to inherit common methods - angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope })); + angular.extend(this, $controller('FormServerController', { server: server[0], $scope: $scope })); var getStatuses = function() { statusService.getStatuses() @@ -37,7 +37,7 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal, }); }; - $scope.serverName = angular.copy(server.hostName); + $scope.serverName = server[0].hostName; $scope.settings = { isNew: false, @@ -46,9 +46,20 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal, $scope.save = function(server) { serverService.updateServer(server). - then(function() { - $scope.refresh(); - }); + then( + function(result) { + $scope.refresh(); + messageModel.setMessages(result.data.alerts, false); + }, + function(fault) { + messageModel.setMessages(fault.data.alerts, false); + } + ) + .finally( + function() { + $anchorScroll(); // scrolls window to top for message + } + ); }; $scope.confirmDelete = function(server) { @@ -80,5 +91,5 @@ var FormEditServerController = function(server, $scope, $controller, $uibModal, }; -FormEditServerController.$inject = ['server', '$scope', '$controller', '$uibModal', 'locationUtils', 'serverService', 'statusService', 'messageModel']; +FormEditServerController.$inject = ['server', '$anchorScroll', '$scope', '$controller', '$uibModal', 'locationUtils', 'serverService', 'statusService', 'messageModel']; module.exports = FormEditServerController; diff --git a/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html b/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html index 993dfbb3e9..1d33716a91 100644 --- a/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html +++ b/traffic_portal/app/src/common/modules/form/server/form.server.tpl.html @@ -16,14 +16,13 @@ specific language governing permissions and limitations under the License. --> -
    -
  1. Servers
    2. +
  2. Servers
  3. {{serverName}}
-
+
-
+

-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - Required - Too Long - Invalid - -
-
-
- -
- - Required - Too Long - Invalid - -
-
-
- -
- - Required - View Details   -
-
-
- -
- - Required - View Details   -
-
-
- -
- - Required - View Details   -
+ + + +
+
-
- -
- - Required - View Details   -
+ + +
+
-
- -
- - Required - Too Long - -
+ + +
+
-
- -
- Is Service Address - - Network IP or IPv6 Address Is Required - Too Long - Invalid - -
+ + +
+ + Required + Too Long + Invalid +
-
- -
- - Required - Too Long - Invalid - -
+ + +
+ + Required + Too Long + Invalid +
-
- -
- - Required - Too Long - Invalid - -
+ + +
+ + Required + View Details  
-
- -
- - Required - Whole Number - -
+ + +
+ + Required + View Details  
-
- -
- - Required - View Details   -
+ + +
+ + Required + View Details  
-
- -
- Is Service Address - - Network IP or IPv6 Address Is Required - Too Long - -
+ + +
+ + Required + View Details  
-
- -
- - Too Long - -
+ + +
+ + Required + View Details  
-
- -
- - Whole Number - -
+ + +
+ + Invalid port number (must be whole number less than 65536) +
-
- -
- - Whole Number - -
+ + +
+ + Invalid port number (must be whole number less than 65536) +
-
- -
- - Too Long - -
+ + +
+ + Too Long +
-
- -
- - Too Long - Invalid - + + +
+ + Invalid +
-
- -
- - Too Long - Invalid - + + +
+ + Invalid +
-
- -
- - Too Long - Invalid - + + +
+ + Invalid +
-
- -
- - Too Long - Invalid - -
+ + +
+ + Invalid +
-
- -
- - Too Long - Invalid - -
+ + +
+ + Invalid +
-
- -
- - Too Long - Invalid - -
+ + +
+ + Invalid +
-
- -
- - Too Long - No Spaces - -
+ + +
+ + Too Long + No Spaces +
-
- -
- - Too Long - -
+ + +
+ + Too Long +
-
- -
- - Too Long - No Spaces - -
+ + +
+ + Too Long + No Spaces +
-
- -
- - Too Long - -
+ + +
+ + Too Long +
-
+ +
+ Interfaces +
+ + + + + +
+ + + + + Invalid MTU - must be 1500 or 9000 + + + Cannot be negative +
+ +
+ IP Addresses +
    +
  • + + + Invalid address + Required + + + Invalid gateway + + + +
    • +
+
+
+
+ +
diff --git a/traffic_portal/app/src/common/modules/form/server/new/FormNewServerController.js b/traffic_portal/app/src/common/modules/form/server/new/FormNewServerController.js index 1e17a3980d..f736f3c02a 100644 --- a/traffic_portal/app/src/common/modules/form/server/new/FormNewServerController.js +++ b/traffic_portal/app/src/common/modules/form/server/new/FormNewServerController.js @@ -17,7 +17,7 @@ * under the License. */ -var FormNewServerController = function(server, $scope, $controller, serverService, statusService) { +var FormNewServerController = function(server, $anchorScroll, $scope, $controller, serverService, statusService, messageModel, locationUtils) { // extends the FormServerController to inherit common methods angular.extend(this, $controller('FormServerController', { server: server, $scope: $scope })); @@ -40,7 +40,17 @@ var FormNewServerController = function(server, $scope, $controller, serverServic }; $scope.save = function(server) { - serverService.createServer(server); + serverService.createServer(server). + then( + function(result) { + messageModel.setMessages(result.data.alerts, true); + locationUtils.navigateToPath('/servers'); + }, + function(fault) { + $anchorScroll(); // scrolls window to top for message + messageModel.setMessages(fault.data.alerts, false); + } + ); }; var init = function () { @@ -50,5 +60,5 @@ var FormNewServerController = function(server, $scope, $controller, serverServic }; -FormNewServerController.$inject = ['server', '$scope', '$controller', 'serverService', 'statusService']; +FormNewServerController.$inject = ['server', '$anchorScroll', '$scope', '$controller', 'serverService', 'statusService', 'messageModel', 'locationUtils']; module.exports = FormNewServerController; diff --git a/traffic_portal/app/src/common/modules/table/_table.scss b/traffic_portal/app/src/common/modules/table/_table.scss index e6a28683e8..c73bb1a6a6 100644 --- a/traffic_portal/app/src/common/modules/table/_table.scss +++ b/traffic_portal/app/src/common/modules/table/_table.scss @@ -16,24 +16,30 @@ */ .x_content { - table { - width: 100% !important; - } + table { + width: 100% !important; + } } .update-column { - text-align: center; - .fa-flag { - font-weight: bold; - } + text-align: center; + .fa-flag { + font-weight: bold; + } +} + +button.action-link { + padding: 5px; + color: #337ab7; + border: none; + background-color: inherit; } .action-link { - padding: 5px; } td span { - line-height: 19px; + line-height: 19px; } .filter-checkbox { @@ -41,71 +47,71 @@ td span { } .table { - margin-bottom: 0px !important; + margin-bottom: 0px !important; } .ds-comment-bold { - font-weight:bold; + font-weight:bold; } .ds-comment-italic { - font-style:italic; - font-size:x-small; + font-style:italic; + font-size:x-small; } .dsComments-container { - border-bottom: 1px solid #111; - margin-top: -2px; + border-bottom: 1px solid #111; + margin-top: -2px; } .ds-comment-cell { - line-height: 1.428571429; - vertical-align: top; - border-top: 1px solid #ddd; - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; - padding-bottom: 8px; - min-height: 52px; - - &:hover { - background-color: #F1FAF8; - } - - .cell-left { - padding-top: 8px; - margin-left: 8px; - width: 80%; - } - .cell-right { - padding-top: 8px; - margin-right: 8px; - } + line-height: 1.428571429; + vertical-align: top; + border-top: 1px solid #ddd; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + padding-bottom: 8px; + min-height: 52px; + + &:hover { + background-color: #F1FAF8; + } + + .cell-left { + padding-top: 8px; + margin-left: 8px; + width: 80%; + } + .cell-right { + padding-top: 8px; + margin-right: 8px; + } } .ds-comment-nodata { - line-height: 1.428571429; - text-align: center; - border-left: 1px solid #ddd; - border-right: 1px solid #ddd; - padding-top: 4px; - padding-bottom: 8px; - min-height: 30px; - - &:hover { - background-color: #F1FAF8; - } + line-height: 1.428571429; + text-align: center; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + padding-top: 4px; + padding-bottom: 8px; + min-height: 30px; + + &:hover { + background-color: #F1FAF8; + } } .column-settings { - max-height: 300px; - padding: 10px 20px; - overflow-y: auto; + max-height: 300px; + padding: 10px 20px; + overflow-y: auto; } table.dataTable.params tbody td { - word-break: break-word; - vertical-align: top; + word-break: break-word; + vertical-align: top; } th.center, td.center { - text-align: center; + text-align: center; } .dt-button.btn-link { - text-decoration: underline; + text-decoration: underline; } /* Table context menus */ diff --git a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html index 2fc47e8615..da5f209282 100644 --- a/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/cacheGroupServers/table.cacheGroupServers.tpl.html @@ -103,17 +103,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html index c17266e98d..612aed5e67 100644 --- a/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/cdnServers/table.cdnServers.tpl.html @@ -103,17 +103,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html index 9f87ab37a3..89716237d1 100644 --- a/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/deliveryServiceServers/table.deliveryServiceServers.tpl.html @@ -95,17 +95,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} @@ -127,7 +127,7 @@ - + diff --git a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html index 08c3f5aa99..d5788f9afe 100644 --- a/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/physLocationServers/table.physLocationServers.tpl.html @@ -93,17 +93,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html index a5783b7263..0711fb2050 100644 --- a/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/profileServers/table.profileServers.tpl.html @@ -93,17 +93,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/modules/table/serverConfigFiles/TableServerConfigFilesController.js b/traffic_portal/app/src/common/modules/table/serverConfigFiles/TableServerConfigFilesController.js index 7cda576f31..13f13c6891 100644 --- a/traffic_portal/app/src/common/modules/table/serverConfigFiles/TableServerConfigFilesController.js +++ b/traffic_portal/app/src/common/modules/table/serverConfigFiles/TableServerConfigFilesController.js @@ -19,7 +19,7 @@ var TableServerConfigFilesController = function(server, serverConfigFiles, $scope, $state, $uibModal, locationUtils) { - $scope.server = server; + $scope.server = server[0]; $scope.configFiles = serverConfigFiles.configFiles; diff --git a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js index feeb2aa275..aefcf55091 100644 --- a/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js +++ b/traffic_portal/app/src/common/modules/table/serverDeliveryServices/TableServerDeliveryServicesController.js @@ -33,7 +33,7 @@ var TableServerDeliveryServicesController = function(server, deliveryServices, $ ); }; - $scope.server = server; + $scope.server = server[0]; // adds some items to the base delivery services context menu $scope.contextMenuItems.splice(2, 0, diff --git a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js index d3b6e1a823..70c3a544be 100644 --- a/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js +++ b/traffic_portal/app/src/common/modules/table/serverServerCapabilities/TableServerServerCapabilitiesController.js @@ -19,7 +19,7 @@ var TableServerServerCapabilitiesController = function(server, serverCapabilities, $scope, $state, $uibModal, locationUtils, serverUtils, serverService, messageModel) { - $scope.server = server; + $scope.server = server[0]; $scope.serverCapabilities = serverCapabilities; diff --git a/traffic_portal/app/src/common/modules/table/servers/TableParentServersController.js b/traffic_portal/app/src/common/modules/table/servers/TableParentServersController.js index 5fb0adc192..7aea96e332 100644 --- a/traffic_portal/app/src/common/modules/table/servers/TableParentServersController.js +++ b/traffic_portal/app/src/common/modules/table/servers/TableParentServersController.js @@ -129,6 +129,8 @@ var TableParentServersController = function(servers, $scope, $state, $uibModal, }; $scope.servers = servers; + $scope.serverNetInfo = new Map(servers.map(function(s){return [s.id, serverUtils.toLegacyIPInfo(s.interfaces)];})); + $scope.columns = [ { "name": "Cache Group", "visible": true, "searchable": 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 85a4dc20f2..1ddc42c5cc 100644 --- a/traffic_portal/app/src/common/modules/table/servers/TableServersController.js +++ b/traffic_portal/app/src/common/modules/table/servers/TableServersController.js @@ -258,8 +258,12 @@ var TableServersController = function(servers, $scope, $state, $uibModal, $windo /** All of the statuses (populated on init). */ let statuses = []; - /** All of the servers - lastUpdated fields converted to actual Dates. */ - $scope.servers = servers.map(function(x){x.lastUpdated = x.lastUpdated ? new Date(x.lastUpdated.replace("+00", "Z")) : x.lastUpdated;}); + /** All of the servers - lastUpdated fields converted to actual Dates, ip fields populated from interfaces */ + $scope.servers = servers.map( + function(x) { + x.lastUpdated = x.lastUpdated ? new Date(x.lastUpdated.replace("+00", "Z")) : x.lastUpdated; + Object.assign(x, serverUtils.toLegacyIPInfo(x.interfaces)); + }); /** The base URL to use for constructing links to server charts. */ $scope.chartsBase = propertiesModel.properties.servers.charts.baseUrl; diff --git a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html index 5ddb8a07a5..9975036a0b 100644 --- a/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/statusServers/table.statusServers.tpl.html @@ -93,17 +93,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html index eb7b7fc8c3..86128e4698 100644 --- a/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html +++ b/traffic_portal/app/src/common/modules/table/typeServers/table.typeServers.tpl.html @@ -93,17 +93,17 @@ {{::s.iloIpGateway}} {{::s.iloIpNetmask}} {{::s.iloUsername}} - {{::s.interfaceName}} - {{::s.ip6Address}} - {{::s.ip6Gateway}} + {{::serverNetInfo.get(s.id).interfaceName}} + {{::serverNetInfo.get(s.id).ip6Address}} + {{::serverNetInfo.get(s.id).ip6Gateway}} {{::getRelativeTime(s.lastUpdated)}} {{::s.mgmtIpAddress}} {{::s.mgmtIpGateway}} {{::s.mgmtIpNetmask}} - {{::s.ipGateway}} - {{::s.ipAddress}} - {{::s.interfaceMtu}} - {{::s.ipNetmask}} + {{::serverNetInfo.get(s.id).ipGateway}} + {{::serverNetInfo.get(s.id).ipAddress}} + {{::serverNetInfo.get(s.id).interfaceMtu}} + {{::serverNetInfo.get(s.id).ipNetmask}} {{::s.offlineReason}} {{::s.physLocation}} {{::s.profile}} diff --git a/traffic_portal/app/src/common/service/utils/ServerUtils.js b/traffic_portal/app/src/common/service/utils/ServerUtils.js index 517c49102d..491d58164b 100644 --- a/traffic_portal/app/src/common/service/utils/ServerUtils.js +++ b/traffic_portal/app/src/common/service/utils/ServerUtils.js @@ -19,6 +19,17 @@ var ServerUtils = function($window, propertiesModel, userModel) { + // This RegExp matches any valid IPv4 or IPv6 address - CIDRs allowed on IPv6 addresses only + // Source: Rahul Tripathy @ https://stackoverflow.com/questions/32324614/how-to-validate-ipv6-address-in-angularjs#answer-32324868 + // May Neptune have mercy on my soul... + this.IPPattern = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\:){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?(\/(12[0-8]|1[0-1][0-9]|[0-9][0-9]?))?$|^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)$/; + + // ... this one allows IPv4 addresses to have CIDR-notation subnets + this.IPWithCIDRPattern = /^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\:){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$|^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?(\/(12[0-8]|1[0-1][0-9]|[0-9][0-9]?))?$|^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)(\/(3[0-2]|[0-2]?[0-9]))?$/; + // ... this one just matches valid IPv4 addresses (or netmasks) + this.IPv4Pattern = /^((25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[0-1]?[0-9][0-9]?)$/; + + this.isCache = function(server) { return server.type && (server.type.indexOf('EDGE') == 0 || server.type.indexOf('MID') == 0); }; @@ -56,6 +67,80 @@ var ServerUtils = function($window, propertiesModel, userModel) { ); }; + /** + * Converts a server's interfaces into legacy IP information. (primarily + * for use in tables) + * + * It does this by returning only the service addresses of the server. + * + * @param {Array} interfaces - The interfaces of the server to be converted + * @returns {object} An object with all of the legacy properties of non- + * interface-based servers: ipAddress, ipGateway, ipNetmask, ip6Address, + * ip6Gateway, interfaceName, and interfaceMtu + */ + this.toLegacyIPInfo = function(interfaces) { + const legacyInfo = { + ipAddress: null, + ipGateway: null, + ipNetmask: null, + ip6Address: null, + ip6Gateway: null, + interfaceName: null, + interfaceMtu: null + }; + if (!interfaces) { + return legacyInfo; + } + + for (let i = 0; i < interfaces.length; ++i) { + const inf = interfaces[i]; + legacyInfo.interfaceName = inf.name; + legacyInfo.interfaceMtu = inf.mtu; + + for (let j = 0; j < inf.ipAddresses.length; ++j) { + const ip = inf.ipAddresses[j]; + if (!ip.serviceAddress) { + continue; + } + + let address = ip.address; + + // we don't validate ips here; if it has a '.' it's ipv4, + // otherwise it's ipv6 + if (address.includes(".")) { + if (address.includes("/")) { + const parts = address.split("/"); + address = parts[0]; + let masklen = Number(parts[1]); + + const mask = []; + for (let k = 0; k < 4; ++k) { + const n = Math.min(masklen, 8); + mask.push(256 - Math.pow(2, 8-n)); + masklen -= n; + } + legacyInfo.ipNetmask = mask.join("."); + } + legacyInfo.ipAddress = address; + legacyInfo.ipGateway = ip.gateway; + } else { + legacyInfo.ip6Address = address; + legacyInfo.ip6Gateway = ip.gateway; + } + + if (legacyInfo.ipAddress && legacyInfo.ip6Address) { + break; + } + } + + if (legacyInfo.ipAddress && legacyInfo.ip6Address) { + break; + } + } + + return legacyInfo; + } + }; ServerUtils.$inject = ['$window', 'propertiesModel', 'userModel']; diff --git a/traffic_portal/app/src/modules/private/servers/capabilities/index.js b/traffic_portal/app/src/modules/private/servers/capabilities/index.js index a3ce4e58ad..2a7107fba9 100644 --- a/traffic_portal/app/src/modules/private/servers/capabilities/index.js +++ b/traffic_portal/app/src/modules/private/servers/capabilities/index.js @@ -28,7 +28,7 @@ module.exports = angular.module('trafficPortal.private.servers.capabilities', [] controller: 'TableServerServerCapabilitiesController', resolve: { server: function($stateParams, serverService) { - return serverService.getServer($stateParams.serverId); + return serverService.getServers({id: $stateParams.serverId}); }, serverCapabilities: function($stateParams, serverService) { return serverService.getServerCapabilities($stateParams.serverId); diff --git a/traffic_portal/app/src/modules/private/servers/configFiles/index.js b/traffic_portal/app/src/modules/private/servers/configFiles/index.js index cbc3fd109f..9611107008 100644 --- a/traffic_portal/app/src/modules/private/servers/configFiles/index.js +++ b/traffic_portal/app/src/modules/private/servers/configFiles/index.js @@ -28,7 +28,7 @@ module.exports = angular.module('trafficPortal.private.servers.configFiles', []) controller: 'TableServerConfigFilesController', resolve: { server: function($stateParams, serverService) { - return serverService.getServer($stateParams.serverId); + return serverService.getServers({id: $stateParams.serverId}); }, serverConfigFiles: function($stateParams, serverService) { return serverService.getServerConfigFiles($stateParams.serverId); diff --git a/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js b/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js index 127f1fcaa5..a3e21610ba 100644 --- a/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js +++ b/traffic_portal/app/src/modules/private/servers/deliveryServices/index.js @@ -28,7 +28,7 @@ module.exports = angular.module('trafficPortal.private.servers.deliveryServices' controller: 'TableServerDeliveryServicesController', resolve: { server: function($stateParams, serverService) { - return serverService.getServer($stateParams.serverId); + return serverService.getServers({id: $stateParams.serverId}); }, deliveryServices: function($stateParams, deliveryServiceService) { return deliveryServiceService.getServerDeliveryServices($stateParams.serverId); diff --git a/traffic_portal/app/src/modules/private/servers/edit/index.js b/traffic_portal/app/src/modules/private/servers/edit/index.js index 02fcaffd32..1dbeb3d3e3 100644 --- a/traffic_portal/app/src/modules/private/servers/edit/index.js +++ b/traffic_portal/app/src/modules/private/servers/edit/index.js @@ -28,7 +28,7 @@ module.exports = angular.module('trafficPortal.private.servers.edit', []) controller: 'FormEditServerController', resolve: { server: function($stateParams, serverService) { - return serverService.getServer($stateParams.serverId); + return serverService.getServers({id: $stateParams.serverId}); } } } diff --git a/traffic_portal/test/end_to_end/servers/pageData.js b/traffic_portal/test/end_to_end/servers/pageData.js index 5a30dc9a7e..8276e5b051 100644 --- a/traffic_portal/test/end_to_end/servers/pageData.js +++ b/traffic_portal/test/end_to_end/servers/pageData.js @@ -30,18 +30,16 @@ module.exports = function(){ this.cachegroup=element(by.name('cachegroup')); this.type=element(by.name('type')); this.profile=element(by.name('profile')); - this.interfaceName=element(by.name('interfaceName')); - this.ipAddress=element(by.name('ipAddress')); - this.ipNetmask=element(by.name('ipNetmask')); - this.ipGateway=element(by.name('ipGateway')); - this.interfaceMtu=element(by.name('interfaceMtu')); this.physLocation=element(by.name('physLocation')); + this.addInterfaceBtn=element(by.name('addInterfaceBtn')); + this.addIPBtn=element(by.name('addIPBtn')); + this.interfaceName=element(by.css('.interface-name-input')); + this.ipAddress=element(by.css('.ip-input')); + this.ipIsService=element(by.css('.service-addr-cb')); this.createButton=element(by.buttonText('Create')); this.deleteButton=element(by.buttonText('Delete')); this.updateButton=element(by.buttonText('Update')); this.submitButton=element(by.buttonText('Submit')); - this.searchFilter=element(by.id('serversTable_filter')).element(by.css('label input')); this.confirmWithNameInput=element(by.name('confirmWithNameInput')); this.deletePermanentlyButton=element(by.buttonText('Delete Permanently')); - this.ipIsService=element(by.name('ipIsService')); }; \ No newline at end of file diff --git a/traffic_portal/test/end_to_end/servers/servers-spec.js b/traffic_portal/test/end_to_end/servers/servers-spec.js index 1f5d240783..dd19355d78 100644 --- a/traffic_portal/test/end_to_end/servers/servers-spec.js +++ b/traffic_portal/test/end_to_end/servers/servers-spec.js @@ -30,8 +30,6 @@ describe('Traffic Portal Servers Test Suite', function() { domainName: "servertest.com", interfaceName: "testInterfaceName", ipAddress: "10.42.80.118", - ipNetmask: "255.255.255.252", - ipGateway: "10.42.80.117", interfaceMtu: "9000", }; @@ -58,13 +56,12 @@ describe('Traffic Portal Servers Test Suite', function() { commonFunctions.selectDropdownbyNum(pageData.cachegroup, 1); element(by.css("#type [label='EDGE']")).click(); commonFunctions.selectDropdownbyNum(pageData.profile, 1); + commonFunctions.selectDropdownbyNum(pageData.physLocation, 1); + pageData.addInterfaceBtn.click(); pageData.interfaceName.sendKeys(mockVals.interfaceName); + pageData.addIPBtn.click(); pageData.ipAddress.sendKeys(mockVals.ipAddress); - pageData.ipNetmask.sendKeys(mockVals.ipNetmask); - pageData.ipGateway.sendKeys(mockVals.ipGateway); pageData.ipIsService.click(); - pageData.interfaceMtu.sendKeys(mockVals.interfaceMtu); - commonFunctions.selectDropdownbyNum(pageData.physLocation, 1); expect(pageData.createButton.isEnabled()).toBe(true); pageData.createButton.click(); expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/servers");