removes dead routes that must have resurfaced due to a bad conflict resolution


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/fc71c45e
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/fc71c45e
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/fc71c45e

Branch: refs/heads/master
Commit: fc71c45e9367614cda8577b13ecdf7734329b2a4
Parents: da6e877
Author: Jeremy Mitchell <mitchell...@gmail.com>
Authored: Wed Aug 16 11:01:57 2017 -0600
Committer: Dewayne Richardson <dewr...@apache.org>
Committed: Wed Aug 16 11:06:19 2017 -0600

----------------------------------------------------------------------
 traffic_ops/app/lib/TrafficOpsRoutes.pm | 17 -----------------
 1 file changed, 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/fc71c45e/traffic_ops/app/lib/TrafficOpsRoutes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm 
b/traffic_ops/app/lib/TrafficOpsRoutes.pm
index 47e6472..4a5c86a 100644
--- a/traffic_ops/app/lib/TrafficOpsRoutes.pm
+++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm
@@ -409,12 +409,6 @@ sub api_routes {
        $r->put("/api/$version/cachegroups/:id" => [ id => qr/\d+/ ] )->over( 
authenticated => 1, not_ldap => 1 )->to( 'Cachegroup#update', namespace => 
$namespace );
        $r->delete("/api/$version/cachegroups/:id" => [ id => qr/\d+/ ] 
)->over( authenticated => 1, not_ldap => 1 )->to( 'Cachegroup#delete', 
namespace => $namespace );
 
-       # alternate cachegroup routes
-       $r->get("/api/$version/cachegroups/list")->over( authenticated => 1, 
not_ldap => 1 )->to( 'Cachegroup2#index', namespace => $namespace );
-       $r->post("/api/$version/cachegroups/create")->over( authenticated => 1, 
not_ldap => 1 )->to( 'Cachegroup2#create', namespace => $namespace );
-       $r->put("/api/$version/cachegroups/:id/update")->over( authenticated => 
1, not_ldap => 1 )->to( 'Cachegroup2#update', namespace => $namespace );
-       $r->delete("/api/$version/cachegroups/:id/delete")->over( authenticated 
=> 1, not_ldap => 1 )->to( 'Cachegroup2#delete', namespace => $namespace );
-
        # -- CACHEGROUPS: ASSIGN DELIVERYSERVICES
        $r->post("/api/$version/cachegroups/:id/deliveryservices" => [ id => 
qr/\d+/ ] )->over( authenticated => 1, not_ldap => 1 )
                ->to( 'DeliveryServiceServer#assign_ds_to_cachegroup', 
namespace => $namespace );
@@ -511,13 +505,6 @@ sub api_routes {
                ->to( 'Deliveryservice#assign_servers', namespace => $namespace 
);
        $r->delete("/api/$version/deliveryservice_server/:dsId/:serverId" => [ 
dsId => qr/\d+/, serverId => qr/\d+/ ] )->over( authenticated => 1, not_ldap => 
1 )->to( 'DeliveryServiceServer#remove_server_from_ds', namespace => $namespace 
);
 
-       # alternate deliveryservice routes
-       $r->get("/api/$version/deliveryservices/list")->over( authenticated => 
1, not_ldap => 1 )->to( 'Deliveryservice2#delivery_services', namespace => 
$namespace );
-       $r->get( "/api/$version/deliveryservices/:id/get" => [ id => qr/\d+/ ] 
)->over( authenticated => 1, not_ldap => 1 )
-               ->to( 'Deliveryservice2#delivery_services', namespace => 
$namespace );
-       $r->post("/api/$version/deliveryservices/create")->over( authenticated 
=> 1, not_ldap => 1 )->to( 'Deliveryservice2#create', namespace => $namespace );
-       $r->put("/api/$version/deliveryservices/:id/update")->over( 
authenticated => 1, not_ldap => 1 )->to( 'Deliveryservice2#update', namespace 
=> $namespace );
-
        # -- DELIVERYSERVICES: HEALTH
        $r->get("/api/$version/deliveryservices/:id/health" => [ id => qr/\d+/ 
] )->over( authenticated => 1, not_ldap => 1 )->to( 'Deliveryservice#health', 
namespace => $namespace );
 
@@ -728,10 +715,6 @@ sub api_routes {
        $r->get( "/api/$version/deliveryservices/:id/unassigned_servers" => [ 
id => qr/\d+/ ] )->over( authenticated => 1, not_ldap => 1 )->to( 
'Server#get_unassigned_servers_by_dsid', namespace => $namespace );
        $r->get( "/api/$version/deliveryservices/:id/servers/eligible" => [ id 
=> qr/\d+/ ] )->over( authenticated => 1, not_ldap => 1 )->to( 
'Server#get_eligible_servers_by_dsid', namespace => $namespace );
 
-       # alternate server routes
-       $r->post("/api/$version/servers/create")->over( authenticated => 1, 
not_ldap => 1 )->to( 'Server2#create', namespace => $namespace );
-       $r->put("/api/$version/servers/:id/update")->over( authenticated => 1, 
not_ldap => 1 )->to( 'Server2#update', namespace => $namespace );
-
        # -- SERVERS: DETAILS
        $r->get("/api/$version/servers/details")->over( authenticated => 1, 
not_ldap => 1 )->to( 'Server#details', namespace => $namespace );
        $r->get("/api/$version/servers/hostname/:name/details")->over( 
authenticated => 1, not_ldap => 1 )->to( 'Server#details_v11', namespace => 
$namespace );

Reply via email to