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:00 UTC

[1/8] incubator-trafficcontrol git commit: adds cachegroup parameters route

Repository: incubator-trafficcontrol
Updated Branches:
  refs/heads/master b5d21b764 -> 81bfb561d


adds cachegroup parameters route


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

Branch: refs/heads/master
Commit: 680a1b72c20286e27b91eff63080e5b80e333662
Parents: f0564a9
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 12:39:44 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 12:39:44 2016 -0700

----------------------------------------------------------------------
 .../traffic_ops_api/v12/cachegroup.rst          | 41 ++++++++++++++++++++
 traffic_ops/app/lib/API/Parameter.pm            | 30 ++++++++++++++
 traffic_ops/app/lib/TrafficOpsRoutes.pm         |  2 +
 3 files changed, 73 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/680a1b72/docs/source/development/traffic_ops_api/v12/cachegroup.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/cachegroup.rst b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
index 2d9f08d..28302dd 100644
--- a/docs/source/development/traffic_ops_api/v12/cachegroup.rst
+++ b/docs/source/development/traffic_ops_api/v12/cachegroup.rst
@@ -184,6 +184,47 @@ Cache Group
 
 |
 
+**GET /api/1.2/cachegroups/:id/parameters**
+
+  Authentication Required: Yes
+
+  Role(s) Required: None
+
+  **Response Properties**
+
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | Parameter                         | Type   | Description                                                              |
+  +===================================+========+==========================================================================+
+  | ``id``                            |   int  | Local unique identifier for the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``name``                          | string | Name of the parameter                                                    |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``value``                         | string | Value of the parameter                                                   |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``configFile``                    | string | Config file associated with the parameter                                |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``secure``                        |  bool  | Is the parameter value only visible to admin users                       |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+  | ``lastUpdated``                   | string | The Time / Date this entry was last updated                              |
+  +-----------------------------------+--------+--------------------------------------------------------------------------+
+
+  **Response Example** ::
+
+    {
+     "response": [
+        {
+            "id": "1100",
+            "name": "cgw.originUrl",
+            "value": "http://to-short.g.foo.net/data/",
+            "configFile": "foo.config",
+            "secure": false,
+            "lastUpdated": "2015-08-27 15:11:49"
+        },
+        { ... }
+     ]
+    }
+
+|
 
 **GET /api/1.2/cachegroup/:parameter_id/parameter**
 

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/680a1b72/traffic_ops/app/lib/API/Parameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Parameter.pm b/traffic_ops/app/lib/API/Parameter.pm
index 218d003..1771038 100644
--- a/traffic_ops/app/lib/API/Parameter.pm
+++ b/traffic_ops/app/lib/API/Parameter.pm
@@ -81,6 +81,36 @@ sub get_profile_params {
 	$self->success( \@data );
 }
 
+sub get_cachegroup_params {
+	my $self         = shift;
+	my $cg_id   = $self->param('id');
+
+	my %criteria;
+	if ( defined $cg_id ) {
+		$criteria{'cachegroup.id'} = $cg_id;
+	} else {
+        return $self->alert("Cache Group ID is required");
+    }
+
+	my $rs_data = $self->db->resultset("CachegroupParameter")->search( \%criteria, { prefetch => [ 'cachegroup', 'parameter' ] } );
+	my @data = ();
+	while ( my $row = $rs_data->next ) {
+		my $value = $row->parameter->value;
+		&UI::Parameter::conceal_secure_parameter_value( $self, $row->parameter->secure, \$value );
+		push(
+			@data, {
+				"name"        => $row->parameter->name,
+				"id"          => $row->parameter->id,
+				"configFile"  => $row->parameter->config_file,
+				"value"       => $value,
+				"secure"      => \$row->parameter->secure,
+				"lastUpdated" => $row->parameter->last_updated
+			}
+		);
+	}
+	$self->success( \@data );
+}
+
 sub create {
     my $self = shift;
     my $params = $self->req->json;

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/680a1b72/traffic_ops/app/lib/TrafficOpsRoutes.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/TrafficOpsRoutes.pm b/traffic_ops/app/lib/TrafficOpsRoutes.pm
index 9d0e546..ae93ac3 100644
--- a/traffic_ops/app/lib/TrafficOpsRoutes.pm
+++ b/traffic_ops/app/lib/TrafficOpsRoutes.pm
@@ -403,6 +403,8 @@ sub api_routes {
 	$r->put("/api/$version/cachegroups/:id")->over( authenticated => 1 )->to( 'Cachegroup#update', namespace => $namespace );
 	$r->delete("/api/$version/cachegroups/:id")->over( authenticated => 1 )->to( 'Cachegroup#delete', namespace => $namespace );
 
+	$r->get( "/api/$version/cachegroups/:id/parameters")->over( authenticated => 1 )->to( 'Parameter#get_cachegroup_params', namespace => $namespace );
+
 	# alternate cachegroup routes
 	$r->get("/api/$version/cachegroups/list")->over( authenticated => 1 )->to( 'Cachegroup2#index', namespace => $namespace );
 	$r->post("/api/$version/cachegroups/create")->over( authenticated => 1 )->to( 'Cachegroup2#create', namespace => $namespace );


[6/8] incubator-trafficcontrol git commit: fixes silly mistakes. it worked but still a bit silly.

Posted by de...@apache.org.
fixes silly mistakes. it worked but still a bit silly.


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

Branch: refs/heads/master
Commit: 3ed31977487cec1cad8b1e5d6b9dc90300bafe35
Parents: 6f18b00
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Fri Dec 30 10:56:13 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Fri Dec 30 10:56:13 2016 -0700

----------------------------------------------------------------------
 traffic_ops/app/lib/API/Asn.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3ed31977/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 039b08f..0880222 100644
--- a/traffic_ops/app/lib/API/Asn.pm
+++ b/traffic_ops/app/lib/API/Asn.pm
@@ -29,7 +29,7 @@ sub index {
 
 	my %criteria;
 	if ( defined $cg_id ) {
-		$criteria{'cachegroup.id'} = $cg_id;
+		$criteria{'cachegroup'} = $cg_id;
 	}
 
 	my @data;


[5/8] incubator-trafficcontrol git commit: leaves off id part to make the move to natural keys easier

Posted by de...@apache.org.
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;


[4/8] incubator-trafficcontrol git commit: adds region filter to phys_locations

Posted by de...@apache.org.
adds region filter to phys_locations


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

Branch: refs/heads/master
Commit: 179411b17970bdf2b48ac8be5f4401c83a94efe6
Parents: 9059556
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 20:56:43 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 20:56:43 2016 -0700

----------------------------------------------------------------------
 .../development/traffic_ops_api/v12/phys_location.rst    |  8 ++++++++
 traffic_ops/app/lib/API/PhysLocation.pm                  | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/179411b1/docs/source/development/traffic_ops_api/v12/phys_location.rst
----------------------------------------------------------------------
diff --git a/docs/source/development/traffic_ops_api/v12/phys_location.rst b/docs/source/development/traffic_ops_api/v12/phys_location.rst
index b9e6cb6..67359e5 100644
--- a/docs/source/development/traffic_ops_api/v12/phys_location.rst
+++ b/docs/source/development/traffic_ops_api/v12/phys_location.rst
@@ -29,6 +29,14 @@ Physical Location
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +--------------+----------+---------------------------------------------+
+  |   Name       | Required |                Description                  |
+  +==============+==========+=============================================+
+  |  ``region``  | no       | Filter by Region ID.                        |
+  +--------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +----------------------+--------+------------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/179411b1/traffic_ops/app/lib/API/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/PhysLocation.pm b/traffic_ops/app/lib/API/PhysLocation.pm
index 6e2de39..ed5d0bb 100644
--- a/traffic_ops/app/lib/API/PhysLocation.pm
+++ b/traffic_ops/app/lib/API/PhysLocation.pm
@@ -27,10 +27,17 @@ use Validate::Tiny ':all';
 my $finfo = __FILE__ . ":";
 
 sub index {
-	my $self = shift;
+	my $self 		= shift;
+	my $region		= $self->param('region');
+
+	my %criteria;
+	if ( defined $region ) {
+		$criteria{'region.id'} = $region;
+	}
+
 	my @data;
 	my $orderby = $self->param('orderby') || "name";
-	my $rs_data = $self->db->resultset("PhysLocation")->search( undef, { prefetch => ['region'], order_by => 'me.' . $orderby } );
+	my $rs_data = $self->db->resultset("PhysLocation")->search( \%criteria, { prefetch => ['region'], order_by => 'me.' . $orderby } );
 	while ( my $row = $rs_data->next ) {
 
 		next if $row->short_name eq 'UNDEF';


[3/8] incubator-trafficcontrol git commit: provides the ability to filter asns by cachegroup id

Posted by de...@apache.org.
provides the ability to filter asns by cachegroup id


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

Branch: refs/heads/master
Commit: 9059556ac85cb4f538f0442b3112c4d4337a1c1b
Parents: c9e1282
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 14:14:09 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 14:14:09 2016 -0700

----------------------------------------------------------------------
 docs/source/development/traffic_ops_api/v12/asn.rst |  8 ++++++++
 traffic_ops/app/lib/API/Asn.pm                      | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9059556a/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 d3ae765..0b56996 100644
--- a/docs/source/development/traffic_ops_api/v12/asn.rst
+++ b/docs/source/development/traffic_ops_api/v12/asn.rst
@@ -30,6 +30,14 @@ ASN
 
   Role(s) Required: None
 
+  **Request Query Parameters**
+
+  +---------------------+----------+---------------------------------------------+
+  |   Name              | Required |                Description                  |
+  +=====================+==========+=============================================+
+  |   ``cachegroupId``  |    no    | Filter ASNs by cache group ID               |
+  +---------------------+----------+---------------------------------------------+
+
   **Response Properties**
 
   +------------------+--------+-------------------------------------------------------------------------+

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9059556a/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 080099a..8557059 100644
--- a/traffic_ops/app/lib/API/Asn.pm
+++ b/traffic_ops/app/lib/API/Asn.pm
@@ -24,10 +24,17 @@ use Data::Dumper;
 
 # Index
 sub index {
-	my $self = shift;
+	my $self    = shift;
+	my $cg_id   = $self->param('cachegroupId');
+
+	my %criteria;
+	if ( defined $cg_id ) {
+		$criteria{'cachegroup.id'} = $cg_id;
+	}
+
 	my @data;
 	my $orderby = $self->param('orderby') || "asn";
-	my $rs_data = $self->db->resultset("Asn")->search( undef, { prefetch => [ { 'cachegroup' => undef } ], order_by => "me." . $orderby } );
+	my $rs_data = $self->db->resultset("Asn")->search( \%criteria, { prefetch => [ { 'cachegroup' => undef } ], order_by => "me." . $orderby } );
 	while ( my $row = $rs_data->next ) {
 		push(
 			@data, {


[8/8] incubator-trafficcontrol git commit: This closes #146

Posted by de...@apache.org.
This closes #146


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

Branch: refs/heads/master
Commit: 81bfb561dbdd39247ca75a65a058174fba32ad42
Parents: eb8ba9f
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue Jan 3 10:52:58 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Jan 3 10:53:31 2017 -0700

----------------------------------------------------------------------

----------------------------------------------------------------------



[7/8] incubator-trafficcontrol git commit: Merge branch 'tc-80' of https://github.com/mitchell852/incubator-trafficcontrol

Posted by de...@apache.org.
Merge branch 'tc-80' of https://github.com/mitchell852/incubator-trafficcontrol


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

Branch: refs/heads/master
Commit: eb8ba9f5742a650e86eabc1be7f721534b425276
Parents: b5d21b7 3ed3197
Author: Dewayne Richardson <de...@apache.org>
Authored: Tue Jan 3 10:49:46 2017 -0700
Committer: Dewayne Richardson <de...@apache.org>
Committed: Tue Jan 3 10:49:46 2017 -0700

----------------------------------------------------------------------
 .../development/traffic_ops_api/v12/asn.rst     |  8 ++++
 .../traffic_ops_api/v12/cachegroup.rst          | 41 ++++++++++++++++++++
 .../traffic_ops_api/v12/phys_location.rst       |  8 ++++
 .../development/traffic_ops_api/v12/server.rst  |  6 ++-
 traffic_ops/app/lib/API/Asn.pm                  | 11 +++++-
 traffic_ops/app/lib/API/Parameter.pm            | 30 ++++++++++++++
 traffic_ops/app/lib/API/PhysLocation.pm         | 11 +++++-
 traffic_ops/app/lib/API/Server.pm               |  4 +-
 traffic_ops/app/lib/TrafficOpsRoutes.pm         |  2 +
 9 files changed, 114 insertions(+), 7 deletions(-)
----------------------------------------------------------------------



[2/8] incubator-trafficcontrol git commit: adds documentation for new server api filters

Posted by de...@apache.org.
adds documentation for new server api filters


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

Branch: refs/heads/master
Commit: c9e1282f6e93a844374b773b18370b09e5c10d1b
Parents: 680a1b7
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Wed Dec 28 14:13:04 2016 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Wed Dec 28 14:13:04 2016 -0700

----------------------------------------------------------------------
 docs/source/development/traffic_ops_api/v12/server.rst | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/c9e1282f/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 3700160..3b5c366 100644
--- a/docs/source/development/traffic_ops_api/v12/server.rst
+++ b/docs/source/development/traffic_ops_api/v12/server.rst
@@ -44,6 +44,10 @@ Server
   +--------------------+----------+---------------------------------------------+
   | ``profileId``      | no       | Used to filter servers by profile.          |
   +--------------------+----------+---------------------------------------------+
+  | ``cdnId``          | no       | Used to filter servers by CDN.              |
+  +--------------------+----------+---------------------------------------------+
+  | ``cachegroupId``   | no       | Used to filter servers by cache group.      |
+  +--------------------+----------+---------------------------------------------+
 
   **Response Properties**