You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jv...@apache.org on 2017/02/27 17:16:59 UTC
[16/20] incubator-trafficcontrol git commit: remove scope parameter
and change ort naming
remove scope parameter and change ort naming
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/253350a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/253350a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/253350a8
Branch: refs/heads/master
Commit: 253350a89352c01e14b9cc371d825c3bc70b19e4
Parents: e0275e6
Author: Derek Gelinas <de...@cable.comcast.com>
Authored: Thu Jan 19 11:54:20 2017 -0500
Committer: Jan van Doorn <jv...@apache.org>
Committed: Mon Feb 27 16:57:46 2017 +0000
----------------------------------------------------------------------
.../app/lib/API/Configs/ApacheTrafficServer.pm | 9 +-
traffic_ops/app/lib/TrafficOpsRoutes.pm | 2 +-
traffic_ops/app/lib/UI/ConfigFiles.pm | 3 -
traffic_ops/app/lib/UI/DeliveryService.pm | 107 -------------------
4 files changed, 4 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/253350a8/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
index 2c5b090..3c97d57 100644
--- a/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
+++ b/traffic_ops/app/lib/API/Configs/ApacheTrafficServer.pm
@@ -28,8 +28,8 @@ use URI;
use File::Basename;
use File::Path;
-#Sub to generate ORT json
-sub ort {
+#Sub to generate config metadata
+sub get_config_metadata {
my $self = shift;
my $id = $self->param('id');
my $filename = 'ort';
@@ -69,13 +69,10 @@ sub ort {
if ( $row->name eq 'location' ) {
$data_obj->{'config_files'}->{ $row->config_file }->{'location'} = $row->value;
}
- elsif ( $row->name eq 'scope' ) {
- $data_obj->{'config_files'}->{ $row->config_file }->{'scope'} = $row->value;
- }
}
}
- foreach my $file ( keys %$data_obj->{'config_files'} ) {
+ foreach my $file ( keys $data_obj->{'config_files'} ) {
if ( !defined( $data_obj->{'config_files'}->{$file}->{'scope'} ) ) {
$data_obj->{'config_files'}->{$file}->{'scope'} = $self->get_scope($file);
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/253350a8/traffic_ops/app/lib/TrafficOpsRoutes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm
index e32e2b3..25c1f39 100644
--- a/traffic_ops/app/lib/TrafficOpsRoutes.pm
+++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm
@@ -472,7 +472,7 @@ sub api_routes {
$r->get("/api/$version/logs/newcount")->over( authenticated => 1 )->to( 'ChangeLog#newlogcount', namespace => $namespace );
# -- CONFIG FILES
- $r->get("/api/$version/server/:id/configfiles/ats")->over( authenticated => 1 )->to ( 'ApacheTrafficServer#ort', namespace => 'API::Configs' );
+ $r->get("/api/$version/server/:id/configfiles/ats")->over( authenticated => 1 )->to ( 'ApacheTrafficServer#get_config_metadata', namespace => 'API::Configs' );
$r->get("/api/$version/profile/:id/configfiles/ats/#filename")->over( authenticated => 1 )->to ( 'ApacheTrafficServer#get_profile_config', namespace => 'API::Configs' );
$r->get("/api/$version/server/:id/configfiles/ats/#filename")->over( authenticated => 1 )->to ( 'ApacheTrafficServer#get_server_config', namespace => 'API::Configs' );
$r->get("/api/$version/cdn/:id/configfiles/ats/#filename")->over( authenticated => 1 )->to ( 'ApacheTrafficServer#get_cdn_config', namespace => 'API::Configs' );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/253350a8/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index c4fba9f..a609963 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -312,9 +312,6 @@ sub param_data {
if ( $row->parameter->name eq "location" ) {
next;
}
- if ( $row->parameter->name eq "scope" ) {
- next;
- }
my $value = $row->parameter->value;
# some files have multiple lines with the same key... handle that with param id.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/253350a8/traffic_ops/app/lib/UI/DeliveryService.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/DeliveryService.pm b/traffic_ops/app/lib/UI/DeliveryService.pm
index bbd3141..169bc34 100644
--- a/traffic_ops/app/lib/UI/DeliveryService.pm
+++ b/traffic_ops/app/lib/UI/DeliveryService.pm
@@ -19,12 +19,10 @@ package UI::DeliveryService;
# JvD Note: you always want to put Utils as the first use. Sh*t don't work if it's after the Mojo lines.
use UI::Utils;
-use API::Configs::ApacheTrafficServer;
use Mojo::Base 'Mojolicious::Controller';
use Data::Dumper;
use JSON;
-
sub index {
my $self = shift;
@@ -591,20 +589,6 @@ sub header_rewrite {
$param_id = $insert->id;
}
- my $scope_id = $self->db->resultset('Parameter')->search( { -and => [ name => 'scope', config_file => $fname ] } )->get_column('id')->single();
- if (!defined($scope_id) ) {
- my $scope = $self->API::Configs::ApacheTrafficServer::get_scope($fname);
- my $insert = $self->db->resultset('Parameter')->create(
- {
- config_file => $fname,
- name => 'scope',
- value => $scope
- }
- );
- $insert->insert();
- $scope_id = $insert->id;
- }
-
my $cdn_name = undef;
my @servers = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $ds_id } )->get_column('server')->all();
if ( $tier eq "mid" ) {
@@ -632,21 +616,6 @@ sub header_rewrite {
);
}
- my $scope_link = $self->db->resultset('ProfileParameter')->search( { profile => $profile_id, parameter => $scope_id } )->single();
- if ( !defined($scope_link) ) {
- if ($cdn_name) {
- my $p_cdn_param = $self->db->resultset('Server')->search( { 'me.profile' => $profile_id }, { prefetch => 'cdn' } );
- if ( $p_cdn_param->next->cdn->name ne $cdn_name ) {
- next;
- }
- }
- my $insert = $self->db->resultset('ProfileParameter')->create(
- {
- profile => $profile_id,
- parameter => $scope_id
- }
- );
- }
}
}
else {
@@ -685,20 +654,6 @@ sub regex_remap {
$param_id = $insert->id;
}
- my $scope_id = $self->db->resultset('Parameter')->search( { -and => [ name => 'scope', config_file => $fname ] } )->get_column('id')->single();
- if (!defined($scope_id) ) {
- my $scope = $self->API::Configs::ApacheTrafficServer::get_scope($fname);
- my $insert = $self->db->resultset('Parameter')->create(
- {
- config_file => $fname,
- name => 'scope',
- value => $scope
- }
- );
- $insert->insert();
- $scope_id = $insert->id;
- }
-
my @servers = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $ds_id } )->get_column('server')->all();
my @profiles = $self->db->resultset('Server')->search( { id => { -in => \@servers } } )->get_column('profile')->all();
foreach my $profile_id (@profiles) {
@@ -711,15 +666,6 @@ sub regex_remap {
}
);
}
- my $scope_link = $self->db->resultset('ProfileParameter')->search( { profile => $profile_id, parameter => $scope_id } )->single();
- if ( !defined($scope_link) ) {
- my $insert = $self->db->resultset('ProfileParameter')->create(
- {
- profile => $profile_id,
- parameter => $scope_id
- }
- );
- }
}
}
else {
@@ -755,20 +701,6 @@ sub cacheurl {
$param_id = $insert->id;
}
- my $scope_id = $self->db->resultset('Parameter')->search( { -and => [ name => 'scope', config_file => $fname ] } )->get_column('id')->single();
- if (!defined($scope_id) ) {
- my $scope = $self->API::Configs::ApacheTrafficServer::get_scope($fname);
- my $insert = $self->db->resultset('Parameter')->create(
- {
- config_file => $fname,
- name => 'scope',
- value => $scope
- }
- );
- $insert->insert();
- $scope_id = $insert->id;
- }
-
my @servers = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $ds_id } )->get_column('server')->all();
my @profiles = $self->db->resultset('Server')->search( { id => { -in => \@servers } } )->get_column('profile')->all();
foreach my $profile_id (@profiles) {
@@ -781,15 +713,6 @@ sub cacheurl {
}
);
}
- my $scope_link = $self->db->resultset('ProfileParameter')->search( { profile => $profile_id, parameter => $scope_id } )->single();
- if ( !defined($scope_link) ) {
- my $insert = $self->db->resultset('ProfileParameter')->create(
- {
- profile => $profile_id,
- parameter => $scope_id
- }
- );
- }
}
}
else {
@@ -823,20 +746,6 @@ sub url_sig {
$param_id = $insert->id;
}
- my $scope_id = $self->db->resultset('Parameter')->search( { -and => [ name => 'scope', config_file => $fname ] } )->get_column('id')->single();
- if (!defined($scope_id) ) {
- my $scope = $self->API::Configs::ApacheTrafficServer::get_scope($fname);
- my $insert = $self->db->resultset('Parameter')->create(
- {
- config_file => $fname,
- name => 'scope',
- value => $scope
- }
- );
- $insert->insert();
- $scope_id = $insert->id;
- }
-
my @servers = $self->db->resultset('DeliveryserviceServer')->search( { deliveryservice => $ds_id } )->get_column('server')->all();
my @profiles = $self->db->resultset('Server')->search( { id => { -in => \@servers } } )->get_column('profile')->all();
foreach my $profile_id (@profiles) {
@@ -849,15 +758,6 @@ sub url_sig {
}
);
}
- my $scope_link = $self->db->resultset('ProfileParameter')->search( { profile => $profile_id, parameter => $scope_id } )->single();
- if ( !defined($scope_link) ) {
- my $insert = $self->db->resultset('ProfileParameter')->create(
- {
- profile => $profile_id,
- parameter => $scope_id
- }
- );
- }
}
}
else {
@@ -875,13 +775,6 @@ sub delete_cfg_file {
my $delete = $self->db->resultset('Parameter')->search( { id => $param_id } );
$delete->delete();
}
-
- my $scope_id = $self->db->resultset('Parameter')->search( { -and => [ name => 'scope', config_file => $fname ] } )->get_column('id')->single();
- if ( defined($scope_id) ) {
- $self->app->log->info( 'deleting scope parameter for ' . $fname );
- my $delete = $self->db->resultset('Parameter')->search( { id => $scope_id } );
- $delete->delete();
- }
}
# Update