Repository: incubator-trafficcontrol Updated Branches: refs/heads/master 62c5a5cbf -> 9d9afe158
removes ort routes that appear to have been broken since 10/5/15 Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/edf65f44 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/edf65f44 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/edf65f44 Branch: refs/heads/master Commit: edf65f4424e64379eb0309320d38552071d613f8 Parents: 62c5a5c Author: Jeremy Mitchell <mitchell...@gmail.com> Authored: Wed Jan 18 14:09:58 2017 -0700 Committer: Dan Kirkwood <dang...@gmail.com> Committed: Fri Jan 20 19:46:18 2017 +0000 ---------------------------------------------------------------------- traffic_ops/app/lib/TrafficOpsRoutes.pm | 2 - traffic_ops/app/lib/UI/Ort.pm | 59 ---------------------------- 2 files changed, 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/edf65f44/traffic_ops/app/lib/TrafficOpsRoutes.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm index 8b7de9c..19aebc2 100644 --- a/traffic_ops/app/lib/TrafficOpsRoutes.pm +++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm @@ -240,9 +240,7 @@ sub ui_routes { # -- Ort $r->route('/ort/:hostname/ort1')->via('GET')->over( authenticated => 1 )->to( 'Ort#ort1', namespace => $namespace ); $r->route('/ort/:hostname/packages')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_versions', namespace => $namespace ); - $r->route('/ort/:hostname/package/:package')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_version', namespace => $namespace ); $r->route('/ort/:hostname/chkconfig')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_chkconfig', namespace => $namespace ); - $r->route('/ort/:hostname/chkconfig/:package')->via('GET')->over( authenticated => 1 )->to( 'Ort#get_package_chkconfig', namespace => $namespace ); # -- Parameter $r->post('/parameter/create')->over( authenticated => 1 )->to( 'Parameter#create', namespace => $namespace ); http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/edf65f44/traffic_ops/app/lib/UI/Ort.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/UI/Ort.pm b/traffic_ops/app/lib/UI/Ort.pm index a026b0b..3da5cbc 100644 --- a/traffic_ops/app/lib/UI/Ort.pm +++ b/traffic_ops/app/lib/UI/Ort.pm @@ -73,47 +73,6 @@ sub __get_json_parameter_list_by_host { return($data_obj); } -sub __get_json_parameter_by_host { - my $self = shift; - my $host = shift; - my $parameter = shift; - my $value = shift; - my $key_name = shift || "name"; - my $key_value = shift || "value"; - my $data_obj; - - my $rs_profile - = $self->db->resultset('Server')->search( { 'me.host_name' => $host }, - { prefectch => [ 'cdn', 'profile' ] } ); - - my $row = $rs_profile->next; - my $id = $row->id; - if ( defined($row) && defined( $row->cdn->name ) ) { - push( - @{$data_obj}, - { $key_name => "CDN_Name", $key_value => $row->cdn->name } - ); - } - - my %condition = ( - 'profile_parameters.profile' => $id, - 'config_file' => $value, - name => $parameter - ); - my $rs_config = $self->db->resultset('Parameter') - ->search( \%condition, { join => 'profile_parameters' } ); - $row = $rs_config->next; - - if ( defined($row) && defined( $row->name ) && defined( $row->value ) ) { - push( - @{$data_obj}, - { $key_name => $row->name, $key_value => $row->value } - ); - } - - return ($data_obj); -} - sub get_package_versions { my $self = shift; my $host_name = $self->param("hostname"); @@ -122,15 +81,6 @@ sub get_package_versions { $self->render( json => $data_obj ); } -sub get_package_version { - my $self = shift; - my $host_name = $self->param("hostname"); - my $package = $self->param("package"); - my $data_obj = __get_json_parameter_by_host($self, $host_name, $package, "package", "name", "version"); - - $self->render( json => $data_obj ); -} - sub get_chkconfig { my $self = shift; my $host_name = $self->param("hostname"); @@ -139,13 +89,4 @@ sub get_chkconfig { $self->render( json => $data_obj ); } -sub get_package_chkconfig { - my $self = shift; - my $host_name = $self->param("hostname"); - my $package = $self->param("package"); - my $data_obj = __get_json_parameter_by_host($self, $host_name, $package, "chkconfig"); - - $self->render( json => $data_obj ); -} - 1;
