You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by de...@apache.org on 2017/01/03 17:54:04 UTC
[5/8] incubator-trafficcontrol git commit: leaves off id part to make
the move to natural keys easier
leaves off id part to make the move to natural keys easier
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/6f18b00d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/6f18b00d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/6f18b00d
Branch: refs/heads/master
Commit: 6f18b00d324a46e711b8465de9f90eec883ad1b9
Parents: 179411b
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 21:03:26 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 21:03:26 2016 -0700
----------------------------------------------------------------------
docs/source/development/traffic_ops_api/v12/asn.rst | 2 +-
docs/source/development/traffic_ops_api/v12/server.rst | 6 +++---
traffic_ops/app/lib/API/Asn.pm | 2 +-
traffic_ops/app/lib/API/Server.pm | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6f18b00d/docs/source/development/traffic_ops_api/v12/asn.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/asn.rst b/docs/source/development/traffic_ops_api/v12/asn.rst
index 0b56996..b5803cd 100644
--- a/docs/source/development/traffic_ops_api/v12/asn.rst
+++ b/docs/source/development/traffic_ops_api/v12/asn.rst
@@ -35,7 +35,7 @@ ASN
+---------------------+----------+---------------------------------------------+
| Name | Required | Description |
+=====================+==========+=============================================+
- | ``cachegroupId`` | no | Filter ASNs by cache group ID |
+ | ``cachegroup`` | no | Filter ASNs by cache group ID |
+---------------------+----------+---------------------------------------------+
**Response Properties**
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6f18b00d/docs/source/development/traffic_ops_api/v12/server.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/server.rst b/docs/source/development/traffic_ops_api/v12/server.rst
index 3b5c366..a53151e 100644
--- a/docs/source/development/traffic_ops_api/v12/server.rst
+++ b/docs/source/development/traffic_ops_api/v12/server.rst
@@ -42,11 +42,11 @@ Server
+--------------------+----------+---------------------------------------------+
| ``type`` | no | Used to filter servers by type. |
+--------------------+----------+---------------------------------------------+
- | ``profileId`` | no | Used to filter servers by profile. |
+ | ``profileId`` | no | Used to filter servers by profile ID. |
+--------------------+----------+---------------------------------------------+
- | ``cdnId`` | no | Used to filter servers by CDN. |
+ | ``cdn`` | no | Used to filter servers by CDN ID. |
+--------------------+----------+---------------------------------------------+
- | ``cachegroupId`` | no | Used to filter servers by cache group. |
+ | ``cachegroup`` | no | Used to filter servers by cache group ID. |
+--------------------+----------+---------------------------------------------+
**Response Properties**
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6f18b00d/traffic_ops/app/lib/API/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Asn.pm b/traffic_ops/app/lib/API/Asn.pm
index 8557059..039b08f 100644
--- a/traffic_ops/app/lib/API/Asn.pm
+++ b/traffic_ops/app/lib/API/Asn.pm
@@ -25,7 +25,7 @@ use Data::Dumper;
# Index
sub index {
my $self = shift;
- my $cg_id = $self->param('cachegroupId');
+ my $cg_id = $self->param('cachegroup');
my %criteria;
if ( defined $cg_id ) {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6f18b00d/traffic_ops/app/lib/API/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Server.pm b/traffic_ops/app/lib/API/Server.pm
index 0a3a905..672c17f 100644
--- a/traffic_ops/app/lib/API/Server.pm
+++ b/traffic_ops/app/lib/API/Server.pm
@@ -36,8 +36,8 @@ sub index {
my $type = $self->param('type');
my $status = $self->param('status');
my $profile_id = $self->param('profileId');
- my $cdn_id = $self->param('cdnId');
- my $cg_id = $self->param('cachegroupId');
+ my $cdn_id = $self->param('cdn');
+ my $cg_id = $self->param('cachegroup');
my $servers;
my $forbidden;