mitchell852 closed pull request #2054: TO API: fix ds edgeHeaderRewrite unit
test errors
URL: https://github.com/apache/incubator-trafficcontrol/pull/2054
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/traffic_ops/app/lib/API/Deliveryservice.pm
b/traffic_ops/app/lib/API/Deliveryservice.pm
index 749a628e2..1676de17a 100644
--- a/traffic_ops/app/lib/API/Deliveryservice.pm
+++ b/traffic_ops/app/lib/API/Deliveryservice.pm
@@ -751,19 +751,19 @@ sub create {
&log( $self, "Created delivery service [ '" . $insert->xml_id .
"' ] with id: " . $insert->id, "APICHANGE" );
# create location parameters for header_rewrite*, regex_remap*
and cacheurl* config files if necessary
- &UI::DeliveryService::header_rewrite( $self, $insert->id,
$values->{profileId}, $values->{xmlId}, $values->{edgeHeaderRewrite}, "edge" );
- &UI::DeliveryService::header_rewrite( $self, $insert->id,
$values->{profileId}, $values->{xmlId}, $values->{midHeaderRewrite}, "mid" );
- &UI::DeliveryService::regex_remap( $self, $insert->id,
$values->{profileId}, $values->{xmlId}, $values->{regexRemap} );
- &UI::DeliveryService::cacheurl( $self, $insert->id,
$values->{profileId}, $values->{xmlId}, $values->{cacheurl} );
+ &UI::DeliveryService::header_rewrite( $self, $insert->id,
$values->{id}, $values->{xml_id}, $values->{edge_header_rewrite}, "edge" );
+ &UI::DeliveryService::header_rewrite( $self, $insert->id,
$values->{profile_id}, $values->{xml_id}, $values->{mid_header_rewrite}, "mid"
);
+ &UI::DeliveryService::regex_remap( $self, $insert->id,
$values->{profile_id}, $values->{xml_id}, $values->{regex_remap} );
+ &UI::DeliveryService::cacheurl( $self, $insert->id,
$values->{profile_id}, $values->{xml_id}, $values->{cacheurl} );
# create a default deliveryservice_regex in the format
.*\.xml-id\..*
$self->create_default_ds_regex( $insert->id, '.*\.' .
$insert->xml_id . '\..*' );
# create dnssec keys if necessary
- my $cdn = $self->db->resultset('Cdn')->search( { id =>
$values->{cdnId} } )->single();
+ my $cdn = $self->db->resultset('Cdn')->search( { id =>
$values->{cdn_id} } )->single();
my $dnssec_enabled = $cdn->dnssec_enabled;
if ($dnssec_enabled) {
- &UI::DeliveryService::create_dnssec_keys( $self,
$cdn->name, $values->{xmlId}, $insert->id, $cdn->domain_name );
+ &UI::DeliveryService::create_dnssec_keys( $self,
$cdn->name, $values->{xml_id}, $insert->id, $cdn->domain_name );
&log( $self, "Created delivery service dnssec keys for
[ '" . $insert->xml_id . "' ]", "APICHANGE" );
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
