Apply suggestions

Signed-off-by: abarreiro <abarreiro@vmware.com>

govcd/vdc_template.go

@@ -43,10 +43,10 @@ func genericVdcTemplateRequest(client *Client, input types.VMWVdcTemplate, href
 	result := &types.VMWVdcTemplate{}
 
 	resp, err := client.executeJsonRequest(href.String(), method, input, "error when performing a "+method+" for VDC Template: %s")
-	defer closeBody(resp)
 	if err != nil {
 		return nil, err
 	}
+	defer closeBody(resp)
 
 	vdcTemplate := VdcTemplate{
 		VdcTemplate: result,
@@ -68,14 +68,13 @@ func (vcdClient *VCDClient) GetVdcTemplateById(id string) (*VdcTemplate, error)
 
 	result := &types.VMWVdcTemplate{}
 	resp, err := vcdClient.Client.executeJsonRequest(href.String(), http.MethodGet, nil, "error getting VDC Template: %s")
-	defer closeBody(resp)
-
 	if err != nil {
 		if strings.Contains(err.Error(), "RESOURCE_NOT_FOUND") || strings.Contains(err.Error(), "not exist") {
 			return nil, fmt.Errorf("%s: %s", ErrorEntityNotFound, err)
 		}
 		return nil, err
 	}
+	defer closeBody(resp)
 
 	vdcTemplate := VdcTemplate{
 		VdcTemplate: result,

types/v56/types.go

@@ -719,6 +719,8 @@ type VMWVdcTemplateBinding struct {
 type VMWVdcTemplateSpecification struct {
 	Type string `json:"_type,omitempty"`
 
+	// Indicates that the Provider VDC's automatically-created VXLAN network pool should be used.
+	// NetworkPoolReference must be empty if this element appears in the request.
 	AutomaticNetworkPoolReference *AutomaticNetworkPoolReference `json:"automaticNetworkPoolReference,omitempty"`
 
 	// Maximum number of virtual NICs allowed in this VDC. Defaults to 0, which specifies an unlimited number.
@@ -731,10 +733,6 @@ type VMWVdcTemplateSpecification struct {
 	// Maximum number of network objects that can be deployed in this VDC. Defaults to 0, which means no networks can be deployed.
 	ProvisionedNetworkQuota int `json:"provisionedNetworkQuota"`
 
-	// Indicates that the Provider VDC's automatically-created VXLAN network pool should be used.
-	// NetworkPoolReference must be empty if this element appears in the request.
-	// AutomaticNetworkPoolReference *Reference `xml:"vmext:AutomaticNetworkPoolReference,omitempty"`
-
 	// Defines a gateway and NAT Routed organization VDC network to be created.
 	GatewayConfiguration *VdcTemplateSpecificationGatewayConfiguration `json:"gatewayConfiguration,omitempty"`