Skip to content
This repository was archived by the owner on Nov 24, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
t.Fatal("Fetch DS information returned unknown ID")
}
alerts, reqInf, err := TOSession.AssignDeliveryServiceIDsToServerID(*server.ID, []int{*firstDS.ID}, false)
if err == nil {
t.Errorf("Expected bad assignment to fail, but it didn't! (alerts: %v)", alerts)
if err != nil {
t.Errorf("Expected assignment to succeed, but it didn't! (alerts: %v)", alerts)
}
if reqInf.StatusCode < http.StatusBadRequest || reqInf.StatusCode >= http.StatusInternalServerError {
t.Fatalf("assigning Topology-based delivery service to server - expected: 400-level status code, actual: %d", reqInf.StatusCode)
if reqInf.StatusCode >= http.StatusBadRequest {
t.Fatalf("assigning Topology-based delivery service to server - expected: non-error status code, actual: %d", reqInf.StatusCode)
}

response, _, err := TOSession.GetServerIDDeliveryServices(*server.ID, nil)
Expand All @@ -214,7 +214,7 @@ func AssignTopologyBasedDeliveryService(t *testing.T) {
}
}

if found {
t.Errorf(`Invalid Server/DS assignment was created!`)
if !found {
t.Errorf(`Valid Server/DS assignment was not created!`)
}
}
9 changes: 0 additions & 9 deletions traffic_ops/traffic_ops_golang/server/servers_assignment.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,6 @@ func AssignDeliveryServicesToServerHandler(w http.ResponseWriter, r *http.Reques
api.HandleErr(w, r, inf.Tx.Tx, status, usrErr, sysErr)
return
}
dses, sysErr := dbhelpers.GetDeliveryServicesWithTopologies(inf.Tx.Tx, dsList)
if sysErr != nil {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusInternalServerError, nil, sysErr)
return
}
if len(dses) > 0 {
api.HandleErr(w, r, inf.Tx.Tx, http.StatusBadRequest, fmt.Errorf("delivery services %v are already assigned to a topology", dses), nil)
return
}
}

// We already know the CDN exists because that's part of the serverInfo query above
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ var TableAssignDeliveryServicesController = function(server, deliveryServices, a
return parseInt($(this).attr('id'));
}).get();
$scope.selectedDeliveryServices = _.map(deliveryServices, function(ds) {
if (ds.topology) {
return ds;
}
if (visibleDSIds.includes(ds.id)) {
ds['selected'] = selected;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ <h3 class="modal-title">Assign Delivery Services to {{::server.hostName}}</h3>
</thead>
<tbody>
<tr id="{{::ds.id}}" class="ds-row" ng-class="::{'active': ds.selected}" ng-repeat="ds in ::selectedDeliveryServices" ng-click="ds.selected = !ds.selected; onChange()">
<td><input type="checkbox" ng-model="ds.selected"></td>
<td><input type="checkbox" ng-model="ds.selected" ng-disabled="ds.topology"></td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td data-search="^{{::ds.displayName}}$">{{::ds.displayName}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
Expand Down