TO Client: no ids required in input json

traffic_ops/client/cachegroup.go

@@ -17,6 +17,7 @@ package client
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"net"
 	"net/http"
@@ -30,14 +31,45 @@ const (
 
 // Create a CacheGroup
 func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*tc.CacheGroupDetailResponse, ReqInf, error) {
+	if cachegroup.TypeID == nil && cachegroup.Type != nil {
+		ty, _, err := to.GetTypeByName(*cachegroup.Type)
+		if err != nil {
+			return nil, ReqInf{}, err
+		}
+		if len(ty) == 0 {
+			return nil, ReqInf{}, errors.New("no type named " + *cachegroup.Type)
+		}
+		cachegroup.TypeID = &ty[0].ID
+	}
+
+	if cachegroup.ParentCachegroupID == nil && cachegroup.ParentName != nil {
+		p, _, err := to.GetCacheGroupByName(*cachegroup.ParentName)
+		if err != nil {
+			return nil, ReqInf{}, err
+		}
+		if len(p) == 0 {
+			return nil, ReqInf{}, errors.New("no cachegroup named " + *cachegroup.ParentName)
+		}
+		cachegroup.ParentCachegroupID = &p[0].ID
+	}
+
+	if cachegroup.SecondaryParentCachegroupID == nil && cachegroup.SecondaryParentName != nil {
+		p, _, err := to.GetCacheGroupByName(*cachegroup.SecondaryParentName)
+		if err != nil {
+			return nil, ReqInf{}, err
+		}
+		if len(p) == 0 {
+			return nil, ReqInf{}, errors.New("no cachegroup named " + *cachegroup.ParentName)
+		}
+		cachegroup.SecondaryParentCachegroupID = &p[0].ID
+	}
 
-	var remoteAddr net.Addr
 	reqBody, err := json.Marshal(cachegroup)
-	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
 	if err != nil {
-		return nil, reqInf, err
+		return nil, ReqInf{}, err
 	}
 	resp, remoteAddr, err := to.request(http.MethodPost, API_v13_CacheGroups, reqBody)
+	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
 	if err != nil {
 		return nil, reqInf, err
 	}
@@ -52,14 +84,45 @@ func (to *Session) CreateCacheGroupNullable(cachegroup tc.CacheGroupNullable) (*
 // Create a CacheGroup
 // Deprecated: Use CreateCacheGroupNullable
 func (to *Session) CreateCacheGroup(cachegroup tc.CacheGroup) (tc.Alerts, ReqInf, error) {
+	if cachegroup.TypeID == 0 && cachegroup.Type != "" {
+		ty, _, err := to.GetTypeByName(cachegroup.Type)
+		if err != nil {
+			return tc.Alerts{}, ReqInf{}, err
+		}
+		if len(ty) == 0 {
+			return tc.Alerts{}, ReqInf{}, errors.New("no type named " + cachegroup.Type)
+		}
+		cachegroup.TypeID = ty[0].ID
+	}
+
+	if cachegroup.ParentCachegroupID == 0 && cachegroup.ParentName != "" {
+		p, _, err := to.GetCacheGroupByName(cachegroup.ParentName)
+		if err != nil {
+			return tc.Alerts{}, ReqInf{}, err
+		}
+		if len(p) == 0 {
+			return tc.Alerts{}, ReqInf{}, errors.New("no cachegroup named " + cachegroup.ParentName)
+		}
+		cachegroup.ParentCachegroupID = p[0].ID
+	}
+
+	if cachegroup.SecondaryParentCachegroupID == 0 && cachegroup.SecondaryParentName != "" {
+		p, _, err := to.GetCacheGroupByName(cachegroup.SecondaryParentName)
+		if err != nil {
+			return tc.Alerts{}, ReqInf{}, err
+		}
+		if len(p) == 0 {
+			return tc.Alerts{}, ReqInf{}, errors.New("no cachegroup named " + cachegroup.ParentName)
+		}
+		cachegroup.SecondaryParentCachegroupID = p[0].ID
+	}
 
-	var remoteAddr net.Addr
 	reqBody, err := json.Marshal(cachegroup)
-	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
 	if err != nil {
-		return tc.Alerts{}, reqInf, err
+		return tc.Alerts{}, ReqInf{}, err
 	}
 	resp, remoteAddr, err := to.request(http.MethodPost, API_v13_CacheGroups, reqBody)
+	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
 	if err != nil {
 		return tc.Alerts{}, reqInf, err
 	}

traffic_ops/client/deliveryservice.go

@@ -17,6 +17,7 @@ package client
 
 import (
 	"encoding/json"
+	"errors"
 	"strconv"
 
 	"github.com/apache/trafficcontrol/lib/go-tc"
@@ -48,6 +49,7 @@ func (to *Session) DeliveryServicesByServer(id int) ([]tc.DeliveryService, error
 
 func (to *Session) GetDeliveryServicesByServer(id int) ([]tc.DeliveryService, ReqInf, error) {
 	var data tc.DeliveryServicesResponse
+
 	reqInf, err := get(to, deliveryServicesByServerEp(strconv.Itoa(id)), &data)
 	if err != nil {
 		return nil, reqInf, err
@@ -112,6 +114,47 @@ func (to *Session) GetDeliveryServiceNullable(id string) (*tc.DeliveryServiceNul
 
 // CreateDeliveryService creates the DeliveryService it's passed
 func (to *Session) CreateDeliveryService(ds *tc.DeliveryService) (*tc.CreateDeliveryServiceResponse, error) {
+	if ds.TypeID == 0 && ds.Type.String() != "" {
+		ty, _, err := to.GetTypeByName(ds.Type.String())
+		if err != nil {
+			return nil, err
+		}
+		if len(ty) == 0 {
+			return nil, errors.New("no type named " + ds.Type.String())
+		}
+		ds.TypeID = ty[0].ID
+	}
+
+	if ds.CDNID == 0 && ds.CDNName != "" {
+		cdns, _, err := to.GetCDNByName(ds.CDNName)
+		if err != nil {
+			return nil, err
+		}
+		if len(cdns) == 0 {
+			return nil, errors.New("no CDN named " + ds.CDNName)
+		}
+		ds.CDNID = cdns[0].ID
+	}
+
+	if ds.ProfileID == 0 && ds.ProfileName != "" {
+		profiles, _, err := to.GetProfileByName(ds.ProfileName)
+		if err != nil {
+			return nil, err
+		}
+		if len(profiles) == 0 {
+			return nil, errors.New("no Profile named " + ds.ProfileName)
+		}
+		ds.ProfileID = profiles[0].ID
+	}
+
+	if ds.TenantID == 0 && ds.Tenant != "" {
+		ten, _, err := to.TenantByName(ds.Tenant)
+		if err != nil {
+			return nil, err
+		}
+		ds.TenantID = ten.ID
+	}
+
 	var data tc.CreateDeliveryServiceResponse
 	jsonReq, err := json.Marshal(ds)
 	if err != nil {
@@ -125,8 +168,49 @@ func (to *Session) CreateDeliveryService(ds *tc.DeliveryService) (*tc.CreateDeli
 	return &data, nil
 }
 
-// CreateDeliveryService creates the DeliveryService it's passed
+// CreateDeliveryServiceNullable creates the DeliveryService it's passed
 func (to *Session) CreateDeliveryServiceNullable(ds *tc.DeliveryServiceNullable) (*tc.CreateDeliveryServiceNullableResponse, error) {
+	if ds.TypeID == nil && ds.Type != nil {
+		ty, _, err := to.GetTypeByName(ds.Type.String())
+		if err != nil {
+			return nil, err
+		}
+		if len(ty) == 0 {
+			return nil, errors.New("no type named " + ds.Type.String())
+		}
+		ds.TypeID = &ty[0].ID
+	}
+
+	if ds.CDNID == nil && ds.CDNName != nil {
+		cdns, _, err := to.GetCDNByName(*ds.CDNName)
+		if err != nil {
+			return nil, err
+		}
+		if len(cdns) == 0 {
+			return nil, errors.New("no CDN named " + *ds.CDNName)
+		}
+		ds.CDNID = &cdns[0].ID
+	}
+
+	if ds.ProfileID == nil && ds.ProfileName != nil {
+		profiles, _, err := to.GetProfileByName(*ds.ProfileName)
+		if err != nil {
+			return nil, err
+		}
+		if len(profiles) == 0 {
+			return nil, errors.New("no Profile named " + *ds.ProfileName)
+		}
+		ds.ProfileID = &profiles[0].ID
+	}
+
+	if ds.TenantID == nil && ds.Tenant != nil {
+		ten, _, err := to.TenantByName(*ds.Tenant)
+		if err != nil {
+			return nil, err
+		}
+		ds.TenantID = &ten.ID
+	}
+
 	var data tc.CreateDeliveryServiceNullableResponse
 	jsonReq, err := json.Marshal(ds)
 	if err != nil {

traffic_ops/client/deliveryservice_endpoints.go

@@ -22,7 +22,7 @@ func deliveryServicesEp() string {
 }
 
 func deliveryServicesByServerEp(id string) string {
-	return apiBase + "/servers/" + id + dsPath + ".json"
+	return apiBase + "/servers/" + id + dsPath
 }
 
 func deliveryServiceBaseEp(id string) string {

traffic_ops/client/deliveryservice_requests.go

@@ -17,6 +17,7 @@ package client
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io/ioutil"
 	"net"
@@ -31,9 +32,62 @@ const (
 
 // Create a Delivery Service Request
 func (to *Session) CreateDeliveryServiceRequest(dsr tc.DeliveryServiceRequest) (tc.Alerts, ReqInf, error) {
-
 	var alerts tc.Alerts
 	var remoteAddr net.Addr
+	if dsr.AssigneeID == 0 && dsr.Assignee != "" {
+		res, reqInf, err := to.GetUserByUsername(dsr.Assignee)
+		if err != nil {
+			return alerts, reqInf, err
+		}
+		if len(res) == 0 {
+			return alerts, reqInf, errors.New("no user with name " + dsr.Assignee)
+		}
+		dsr.AssigneeID = *res[0].ID
+	}
+
+	if dsr.AuthorID == 0 && dsr.Author != "" {
+		res, reqInf, err := to.GetUserByUsername(dsr.Author)
+		if err != nil {
+			return alerts, reqInf, err
+		}
+		if len(res) == 0 {
+			return alerts, reqInf, errors.New("no user with name " + dsr.Author)
+		}
+		dsr.AuthorID = tc.IDNoMod(*res[0].ID)
+	}
+
+	if dsr.DeliveryService.TypeID == 0 && dsr.DeliveryService.Type.String() != "" {
+		ty, reqInf, err := to.GetTypeByName(dsr.DeliveryService.Type.String())
+		if err != nil || len(ty) == 0 {
+			return alerts, reqInf, errors.New("no type named " + dsr.DeliveryService.Type.String())
+		}
+		dsr.DeliveryService.TypeID = ty[0].ID
+	}
+
+	if dsr.DeliveryService.CDNID == 0 && dsr.DeliveryService.CDNName != "" {
+		cdns, reqInf, err := to.GetCDNByName(dsr.DeliveryService.CDNName)
+		if err != nil || len(cdns) == 0 {
+			return alerts, reqInf, errors.New("no CDN named " + dsr.DeliveryService.CDNName)
+		}
+		dsr.DeliveryService.CDNID = cdns[0].ID
+	}
+
+	if dsr.DeliveryService.ProfileID == 0 && dsr.DeliveryService.ProfileName != "" {
+		profiles, reqInf, err := to.GetProfileByName(dsr.DeliveryService.ProfileName)
+		if err != nil || len(profiles) == 0 {
+			return alerts, reqInf, errors.New("no Profile named " + dsr.DeliveryService.ProfileName)
+		}
+		dsr.DeliveryService.ProfileID = profiles[0].ID
+	}
+
+	if dsr.DeliveryService.TenantID == 0 && dsr.DeliveryService.Tenant != "" {
+		ten, reqInf, err := to.TenantByName(dsr.DeliveryService.Tenant)
+		if err != nil || ten == nil {
+			return alerts, reqInf, errors.New("no Tenant named " + dsr.DeliveryService.Tenant)
+		}
+		dsr.DeliveryService.TenantID = ten.ID
+	}
+
 	reqBody, err := json.Marshal(dsr)
 	reqInf := ReqInf{CacheHitStatus: CacheHitStatusMiss, RemoteAddr: remoteAddr}
 	if err != nil {