rawlinp commented on a change in pull request #6014:
URL: https://github.com/apache/trafficcontrol/pull/6014#discussion_r671459498
##########
File path: traffic_ops/traffic_ops_golang/cdn/queue.go
##########
@@ -56,22 +75,76 @@ func Queue(w http.ResponseWriter, r *http.Request) {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusNotFound, nil, nil)
return
}
+
Review comment:
I think we also need to add the `cdnID` entry in the `queryParams` map.
As I type that, I realize `queryParams` probably isn't the best name since
`cdnID` would actually be coming from a _path_ param. Maybe just call it
`params`?
##########
File path: docs/source/api/v4/cdns_id_queue_update.rst
##########
@@ -70,9 +80,10 @@ Response Structure
Whole-Content-Sha512:
rBpFfrrP+9IFkwsRloEM+v+I8MuBZDXqFu+WUTGtRGypnAn2gHooPoNQRyVvJGjyIQrLXLvqjEtve+lH2Tj4uw==
X-Server-Name: traffic_ops_golang/
Date: Wed, 14 Nov 2018 21:02:07 GMT
- Content-Length: 41
+ Content-Length: 54
{ "response": {
"action": "queue",
- "cdnId": 2
+ "cdnId": 2,
+ "typeID": 11
Review comment:
Since the response is staying the same, this example response change
should be undone as well.
##########
File path: traffic_ops/testing/api/v4/cdn_queue_updates_by_type_profile_test.go
##########
@@ -0,0 +1,133 @@
+package v4
+
+/*
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import (
+ "strconv"
+ "strings"
+ "testing"
+
+ client "github.com/apache/trafficcontrol/traffic_ops/v4-client"
+)
+
+func TestCDNQueueUpdateByProfileAndType(t *testing.T) {
+ WithObjs(t, []TCObj{Types, CDNs, Profiles, Statuses, Divisions,
Regions, PhysLocations, CacheGroups, Servers}, func() {
+ QueueUpdatesByType(t)
+ QueueUpdatesByProfile(t)
+ })
+}
+
+func QueueUpdatesByType(t *testing.T) {
+ queryOpts := client.NewRequestOptions()
+ if len(testData.Servers) < 1 {
+ t.Fatalf("no servers to run the tests on...quitting.")
+ }
+ server := testData.Servers[0]
+ opts := client.NewRequestOptions()
+ if server.CDNName == nil {
+ t.Fatalf("server doesn't have a CDN name...quitting")
+ }
+ opts.QueryParameters.Set("name", *server.CDNName)
+
+ // Get the first server's CDN ID
+ cdns, _, err := TOSession.GetCDNs(opts)
+ if err != nil {
+ t.Fatalf("error while getting CDNs: %v", err)
+ }
+ if len(cdns.Response) < 1 {
+ t.Fatalf("expected 1 CDN in response, got %d",
len(cdns.Response))
+ }
+ opts.QueryParameters.Del("name")
+ queryOpts.QueryParameters.Set("type", server.Type)
+ // Queue updates by type (and CDN)
+ _, _, err = TOSession.QueueUpdatesForCDN(cdns.Response[0].ID, true,
queryOpts)
+ if err != nil {
+ t.Errorf("couldn't queue updates by type (and CDN): %v", err)
+ }
+
+ // Get all the servers for the same CDN and type as that of the first
server
+ opts.QueryParameters.Set("cdn", strconv.Itoa(cdns.Response[0].ID))
+ opts.QueryParameters.Set("type", server.Type)
+ resp, _, err := TOSession.GetServers(opts)
+ if err != nil {
+ t.Fatalf("couldn't get servers by cdn and type: %v", err)
+ }
+ if len(resp.Response) < 1 {
+ t.Fatalf("expected atleast one server in response, got %d",
len(resp.Response))
+ }
+ for _, s := range resp.Response {
+ if s.UpdPending == nil || !*s.UpdPending {
+ t.Errorf("expected updates to be queued on all the
servers filtered by type and CDN, but %s didn't queue updates", *s.HostName)
+ }
+ }
+}
+
+func QueueUpdatesByProfile(t *testing.T) {
+ queryOpts := client.NewRequestOptions()
+ if len(testData.Servers) < 1 {
+ t.Fatalf("no servers to run the tests on...quitting.")
+ }
+ server := testData.Servers[0]
+ opts := client.NewRequestOptions()
+ if server.CDNName == nil || server.Profile == nil {
+ t.Fatalf("server doesn't have a CDN name or a profile
name...quitting")
+ }
+
+ //Get the first server's CDN ID
+ opts.QueryParameters.Set("name", strings.TrimSpace(*server.CDNName))
+
+ cdns, _, err := TOSession.GetCDNs(opts)
+ if err != nil {
+ t.Fatalf("error while getting CDNs: %v", err)
+ }
+ if len(cdns.Response) < 1 {
+ t.Fatalf("expected 1 CDN in response, got %d",
len(cdns.Response))
+ }
+ opts.QueryParameters.Del("name")
+
+ // Get the first server's Profile ID
+ opts.QueryParameters.Set("name", *server.Profile)
+ profiles, _, err := TOSession.GetProfiles(opts)
+ if err != nil {
+ t.Fatalf("error while getting profiles: %v", err)
+ }
+ if len(profiles.Response) < 1 {
+ t.Fatalf("expected 1 profile in response, got %d",
len(profiles.Response))
+ }
+ opts.QueryParameters.Del("name")
+ queryOpts.QueryParameters.Set("profile", profiles.Response[0].Name)
+ // Queue updates by profile (and CDN)
+ _, _, err = TOSession.QueueUpdatesForCDN(cdns.Response[0].ID, true,
queryOpts)
+ if err != nil {
+ t.Errorf("couldn't queue updates by profile (and CDN): %v", err)
+ }
+
+ // Get all the servers for the same CDN and profile as that of the
first server
+ opts.QueryParameters.Set("cdn", strconv.Itoa(cdns.Response[0].ID))
+ opts.QueryParameters.Set("profileId",
strconv.Itoa(profiles.Response[0].ID))
+ resp, _, err := TOSession.GetServers(opts)
+ if err != nil {
+ t.Fatalf("couldn't get servers by cdn and profile: %v", err)
+ }
+ if len(resp.Response) < 1 {
+ t.Fatalf("expected atleast one server in response, got %d",
len(resp.Response))
+ }
+ for _, s := range resp.Response {
+ if s.UpdPending == nil || !*s.UpdPending {
+ t.Errorf("expected updates to be queued on all the
servers filtered by profile and CDN, but %s didn't queue updates", *s.HostName)
+ }
+ }
Review comment:
Additionally, we should probably check servers that _don't_ match the
CDN and profile, and make sure they _weren't_ queued. Also, we should probably
unqueue the servers to clean up and make sure the proper servers were unqueued.
##########
File path: traffic_ops/testing/api/v4/cdn_queue_updates_by_type_profile_test.go
##########
@@ -0,0 +1,133 @@
+package v4
+
+/*
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+import (
+ "strconv"
+ "strings"
+ "testing"
+
+ client "github.com/apache/trafficcontrol/traffic_ops/v4-client"
+)
+
+func TestCDNQueueUpdateByProfileAndType(t *testing.T) {
+ WithObjs(t, []TCObj{Types, CDNs, Profiles, Statuses, Divisions,
Regions, PhysLocations, CacheGroups, Servers}, func() {
+ QueueUpdatesByType(t)
+ QueueUpdatesByProfile(t)
+ })
+}
+
+func QueueUpdatesByType(t *testing.T) {
+ queryOpts := client.NewRequestOptions()
+ if len(testData.Servers) < 1 {
+ t.Fatalf("no servers to run the tests on...quitting.")
+ }
+ server := testData.Servers[0]
+ opts := client.NewRequestOptions()
+ if server.CDNName == nil {
+ t.Fatalf("server doesn't have a CDN name...quitting")
+ }
+ opts.QueryParameters.Set("name", *server.CDNName)
+
+ // Get the first server's CDN ID
+ cdns, _, err := TOSession.GetCDNs(opts)
+ if err != nil {
+ t.Fatalf("error while getting CDNs: %v", err)
+ }
+ if len(cdns.Response) < 1 {
+ t.Fatalf("expected 1 CDN in response, got %d",
len(cdns.Response))
+ }
+ opts.QueryParameters.Del("name")
+ queryOpts.QueryParameters.Set("type", server.Type)
+ // Queue updates by type (and CDN)
+ _, _, err = TOSession.QueueUpdatesForCDN(cdns.Response[0].ID, true,
queryOpts)
+ if err != nil {
+ t.Errorf("couldn't queue updates by type (and CDN): %v", err)
+ }
+
+ // Get all the servers for the same CDN and type as that of the first
server
+ opts.QueryParameters.Set("cdn", strconv.Itoa(cdns.Response[0].ID))
+ opts.QueryParameters.Set("type", server.Type)
+ resp, _, err := TOSession.GetServers(opts)
+ if err != nil {
+ t.Fatalf("couldn't get servers by cdn and type: %v", err)
+ }
+ if len(resp.Response) < 1 {
+ t.Fatalf("expected atleast one server in response, got %d",
len(resp.Response))
+ }
+ for _, s := range resp.Response {
+ if s.UpdPending == nil || !*s.UpdPending {
+ t.Errorf("expected updates to be queued on all the
servers filtered by type and CDN, but %s didn't queue updates", *s.HostName)
+ }
+ }
Review comment:
Additionally, we should probably check servers that _don't_ match the
CDN and type, and make sure they _weren't_ queued. Also, we should probably
unqueue the servers to clean up and make sure the proper servers were unqueued.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
