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 2017/07/19 13:56:07 UTC
[1/2] incubator-trafficcontrol git commit: removed a test that didn't
have any code to support it, fixed another test
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master d37e3865c -> c5c0cc2e9
removed a test that didn't have any code to support it, fixed another test
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8f121209
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8f121209
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8f121209
Branch: refs/heads/master
Commit: 8f1212099c5d4ebdcdef3dce7978d521b191f1d0
Parents: d37e386
Author: David Neuman <da...@gmail.com>
Authored: Tue Jul 18 21:52:36 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Jul 19 07:54:23 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/DeliveryService/SslKeys.pm | 4 ++++
traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t | 11 ++++++-----
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f121209/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
index a2e1c5f..2c5adb6 100644
--- a/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
+++ b/traffic_ops/app/lib/API/DeliveryService/SslKeys.pm
@@ -157,6 +157,10 @@ sub view_by_hostname {
my $cdn_id = $self->db->resultset('Cdn')->search( { domain_name => $domain_name } )->get_column('id')->single();
my $ds = $self->db->resultset('Deliveryservice')->search( { 'regex.pattern' => "$host_regex", 'cdn_id' => "$cdn_id" }, { join => { deliveryservice_regexes => { regex => undef } } } )->single();
+ if (!$ds) {
+ return $self->alert( { Error => " - A delivery service does not exist for a host with hostanme of $key" } );
+ }
+
my $xml_id = $ds->xml_id;
if ( !$version ) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8f121209/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
index e76f7a0..3e94c35 100644
--- a/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
+++ b/traffic_ops/app/t/api/1.1/deliveryservice/ssl_keys.t
@@ -203,13 +203,14 @@ $fake_lwp->mock( 'get', sub { return $fake_get_404 } );
ok $t->get_ok("/api/1.1/deliveryservices/xmlId/foo/sslkeys.json")->status_is(400)->json_has("A record for ssl key foo could not be found")
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-#get_object by hostname, not a hostname
-ok $t->get_ok("/api/1.1/deliveryservices/hostname/foo/sslkeys.json")->status_is(400)->json_has("foo is not a valid hostname.")
- ->or( sub { diag $t->tx->res->content->asset->{content}; } );
+# TODO: Implement functionality to satisfy this test?
+# #get_object by hostname, not a hostname
+# ok $t->get_ok("/api/1.1/deliveryservices/hostname/foo/sslkeys.json")->status_is(400)->json_has("foo is not a valid hostname.")
+# ->or( sub { diag $t->tx->res->content->asset->{content}; } );
#get_object by hostname, ds not found
-ok $t->get_ok("/api/1.1/deliveryservices/hostname/foo.fake-ds.kabletown.com/sslkeys.json")->status_is(400)
- ->json_has("A record for ssl key fake-ds-latest could not be found")->or( sub { diag $t->tx->res->content->asset->{content}; } );
+ok $t->get_ok("/api/1.1/deliveryservices/hostname/foo.fake-ds.cdn1.kabletown.net/sslkeys.json")->status_is(400)
+ ->json_has("A delivery service does not exist for a host with hostanme of foo.fake-ds.cdn1.kabletown.net")->or( sub { diag $t->tx->res->content->asset->{content}; } );
# OFFLINE all riak servers
my $rs = $schema->resultset('Server')->search( { type => 31 } );
[2/2] incubator-trafficcontrol git commit: This closes #737.
Posted by da...@apache.org.
This closes #737.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/c5c0cc2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/c5c0cc2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/c5c0cc2e
Branch: refs/heads/master
Commit: c5c0cc2e9f23a77034ecc553f4b152958053f61f
Parents: 8f12120
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Jul 19 07:54:48 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Wed Jul 19 07:54:48 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------