You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/17 01:29:41 UTC
[1/2] incubator-trafficcontrol git commit: updates to api to handle
booleans properly
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/psql-rebase 3bdfae3f5 -> e919e288a
updates to api to handle booleans properly
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6a3b03ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6a3b03ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6a3b03ee
Branch: refs/heads/psql-rebase
Commit: 6a3b03eee38e138cf82feccc24b96832f6054ed0
Parents: 3bdfae3
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Nov 16 13:15:13 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 16 18:28:24 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/API/Cdn.pm | 16 ++++++++------
traffic_ops/app/lib/API/Deliveryservice.pm | 28 ++++++++++++-------------
2 files changed, 24 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6a3b03ee/traffic_ops/app/lib/API/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Cdn.pm b/traffic_ops/app/lib/API/Cdn.pm
index e8cfd8c..14503bd 100644
--- a/traffic_ops/app/lib/API/Cdn.pm
+++ b/traffic_ops/app/lib/API/Cdn.pm
@@ -145,7 +145,11 @@ sub update {
}
if ( !defined( $params->{name} ) ) {
- return $self->alert("CDN 'name' is required.");
+ return $self->alert("Name is required.");
+ }
+
+ if ( !defined( $params->{dnssecEnabled} ) ) {
+ return $self->alert("dnssecEnabled is required.");
}
my $existing = $self->db->resultset('Cdn')->search( { name => $params->{name} } )->single();
@@ -154,12 +158,12 @@ sub update {
return $self->alert( "a cdn with name " . $params->{name} . " already exists." );
}
- my $value = { name => $params->{name}, };
- if ( defined( $params->{dnssecEnabled} ) ) {
- $value->{dnssec_enabled} = lc( $params->{dnssecEnabled} ) ne 'false' ? 1 : 0;
- }
+ my $values = {
+ name => $params->{name},
+ dnssec_enabled => $params->{dnssecEnabled},
+ };
- my $rs = $cdn->update($value);
+ my $rs = $cdn->update($values);
if ( $rs ) {
my $response;
$response->{id} = $rs->id;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6a3b03ee/traffic_ops/app/lib/API/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm b/traffic_ops/app/lib/API/Deliveryservice.pm
index 6eea73f..2d1c35f 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -241,7 +241,7 @@ sub update {
}
my $values = {
- active => $params->{active} ? 1 : 0,
+ active => $params->{active},
cacheurl => $params->{cacheurl},
ccr_dns_ttl => $params->{ccrDnsTtl},
cdn_id => $params->{cdnId},
@@ -262,8 +262,8 @@ sub update {
http_bypass_fqdn => $params->{httpBypassFqdn},
info_url => $params->{infoUrl},
initial_dispersion => $params->{initialDispersion},
- ipv6_routing_enabled => $params->{ipv6RoutingEnabled} ? 1 : 0,
- logs_enabled => $params->{logsEnabled} ? 1 : 0,
+ ipv6_routing_enabled => $params->{ipv6RoutingEnabled},
+ logs_enabled => $params->{logsEnabled},
long_desc => $params->{longDesc},
long_desc_1 => $params->{longDesc1},
long_desc_2 => $params->{longDesc2},
@@ -271,7 +271,7 @@ sub update {
mid_header_rewrite => $params->{midHeaderRewrite},
miss_lat => $params->{missLat},
miss_long => $params->{missLong},
- multi_site_origin => $params->{multiSiteOrigin} ? 1 : 0,
+ multi_site_origin => $params->{multiSiteOrigin},
multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
org_server_fqdn => $params->{orgServerFqdn},
origin_shield => $params->{originShield},
@@ -280,14 +280,14 @@ sub update {
qstring_ignore => $params->{qstringIgnore},
range_request_handling => $params->{rangeRequestHandling},
regex_remap => $params->{regexRemap},
- regional_geo_blocking => $params->{regionalGeoBlocking} ? 1 : 0,
+ regional_geo_blocking => $params->{regionalGeoBlocking},
remap_text => $params->{remapText},
- signed => $params->{signed} ? 1 : 0,
+ signed => $params->{signed},
ssl_key_version => $params->{sslKeyVersion},
tr_request_headers => $params->{trRequestHeaders},
tr_response_headers => $params->{trResponseHeaders},
type => $params->{typeId},
- xml_id => $params->{xmlId}
+ xml_id => $params->{xmlId},
};
my $rs = $ds->update($values);
@@ -381,7 +381,7 @@ sub create {
}
my $values = {
- active => $params->{active} ? 1 : 0,
+ active => $params->{active},
cacheurl => $params->{cacheurl},
ccr_dns_ttl => $params->{ccrDnsTtl},
cdn_id => $params->{cdnId},
@@ -402,8 +402,8 @@ sub create {
http_bypass_fqdn => $params->{httpBypassFqdn},
info_url => $params->{infoUrl},
initial_dispersion => $params->{initialDispersion},
- ipv6_routing_enabled => $params->{ipv6RoutingEnabled} ? 1 : 0,
- logs_enabled => $params->{logsEnabled} ? 1 : 0,
+ ipv6_routing_enabled => $params->{ipv6RoutingEnabled},
+ logs_enabled => $params->{logsEnabled},
long_desc => $params->{longDesc},
long_desc_1 => $params->{longDesc1},
long_desc_2 => $params->{longDesc2},
@@ -411,7 +411,7 @@ sub create {
mid_header_rewrite => $params->{midHeaderRewrite},
miss_lat => $params->{missLat},
miss_long => $params->{missLong},
- multi_site_origin => $params->{multiSiteOrigin} ? 1 : 0,
+ multi_site_origin => $params->{multiSiteOrigin},
multi_site_origin_algorithm => $params->{multiSiteOriginAlgorithm},
org_server_fqdn => $params->{orgServerFqdn},
origin_shield => $params->{originShield},
@@ -420,14 +420,14 @@ sub create {
qstring_ignore => $params->{qstringIgnore},
range_request_handling => $params->{rangeRequestHandling},
regex_remap => $params->{regexRemap},
- regional_geo_blocking => $params->{regionalGeoBlocking} ? 1 : 0,
+ regional_geo_blocking => $params->{regionalGeoBlocking},
remap_text => $params->{remapText},
- signed => $params->{signed} ? 1 : 0,
+ signed => $params->{signed},
ssl_key_version => $params->{sslKeyVersion},
tr_request_headers => $params->{trRequestHeaders},
tr_response_headers => $params->{trResponseHeaders},
type => $params->{typeId},
- xml_id => $params->{xmlId}
+ xml_id => $params->{xmlId},
};
my $insert = $self->db->resultset('Deliveryservice')->create($values);
[2/2] incubator-trafficcontrol git commit: This closes #88.
Posted by da...@apache.org.
This closes #88.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/e919e288
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/e919e288
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/e919e288
Branch: refs/heads/psql-rebase
Commit: e919e288a40cdd3fd61347ef265ed9ded6812b45
Parents: 6a3b03e
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Nov 16 18:29:21 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Nov 16 18:29:21 2016 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------