#

Signed-off-by: abarreiro <[email protected]>

govcd/api_vcd_test.go

@@ -142,6 +142,7 @@ type TestConfig struct {
 	}
 	Tenants []Tenant `yaml:"tenants,omitempty"`
 	Tm      struct {
+		Region              string `yaml:"region"`
 		RegionStoragePolicy string `yaml:"regionStoragePolicy"`
 
 		CreateVcenter         bool   `yaml:"createVcenter"`

govcd/sample_govcd_test_config.yaml

@@ -300,6 +300,8 @@ solutionAddOn:
   # An existing Add-On image within catalog
   addonImageDse: "vmware-vcd-ds-1.4.0-23376809.iso"
 tm:
+  # An existing Region to create VDCs, Content Libraries...
+  region: my-region
   # An existing Region Storage Policy to create Content Libraries, Regions...
   regionStoragePolicy: "vSAN Default Storage Policy"
   createVcenter: true # boolean value if the vCenter test should be executed

govcd/tm_content_library.go

@@ -100,7 +100,7 @@ func (vcdClient *VCDClient) GetContentLibraryByName(name string) (*ContentLibrar
 		return nil, err
 	}
 
-	return vcdClient.GetContentLibraryById(singleEntity.ContentLibrary.Id)
+	return vcdClient.GetContentLibraryById(singleEntity.ContentLibrary.ID)
 }
 
 // GetContentLibraryById retrieves a Content Library with the given ID
@@ -130,7 +130,7 @@ func (o *ContentLibrary) Delete() error {
 	c := crudConfig{
 		entityLabel:    labelContentLibrary,
 		endpoint:       types.OpenApiPathVcf + types.OpenApiEndpointContentLibraries,
-		endpointParams: []string{o.ContentLibrary.Id},
+		endpointParams: []string{o.ContentLibrary.ID},
 	}
 	return deleteEntityById(&o.vcdClient.Client, c)
 }

govcd/tm_content_library_test.go

@@ -18,36 +18,40 @@ func (vcd *TestVCD) Test_ContentLibraryProvider(check *C) {
 	skipNonTm(vcd, check)
 	sysadminOnly(vcd, check)
 
+	region, err := vcd.client.GetRegionByName("adam-region-1")
+	check.Assert(err, IsNil)
+	check.Assert(region, NotNil)
+
 	cls, err := vcd.client.GetAllContentLibraries(nil)
 	check.Assert(err, IsNil)
 	existingContentLibraryCount := len(cls)
 
-	rsp, err := vcd.client.GetRegionStoragePolicyByName(vcd.config.Tm.RegionStoragePolicy)
+	rsp, err := region.GetStoragePolicyByName(vcd.config.Tm.RegionStoragePolicy)
 	check.Assert(err, IsNil)
 	check.Assert(rsp, NotNil)
 
 	clDefinition := &types.ContentLibrary{
 		Name:           check.TestName(),
-		StorageClasses: []*types.OpenApiReference{{ID: rsp.RegionStoragePolicy.Id}},
+		StorageClasses: []*types.OpenApiReference{{ID: rsp.RegionStoragePolicy.ID}},
 		AutoAttach:     true, // TODO: TM: Test with false, still does not work
 		Description:    check.TestName(),
 	}
 
 	createdCl, err := vcd.client.CreateContentLibrary(clDefinition)
 	check.Assert(err, IsNil)
 	check.Assert(createdCl, NotNil)
-	AddToCleanupListOpenApi(createdCl.ContentLibrary.Name, check.TestName(), types.OpenApiPathVcf+types.OpenApiEndpointContentLibraries+createdCl.ContentLibrary.Id)
+	AddToCleanupListOpenApi(createdCl.ContentLibrary.Name, check.TestName(), types.OpenApiPathVcf+types.OpenApiEndpointContentLibraries+createdCl.ContentLibrary.ID)
 
 	// Defer deletion for a correct cleanup
 	defer func() {
 		err = createdCl.Delete()
 		check.Assert(err, IsNil)
 	}()
-	check.Assert(isUrn(createdCl.ContentLibrary.Id), Equals, true)
+	check.Assert(isUrn(createdCl.ContentLibrary.ID), Equals, true)
 	check.Assert(createdCl.ContentLibrary.Name, Equals, clDefinition.Name)
 	check.Assert(createdCl.ContentLibrary.Description, Equals, clDefinition.Description)
 	check.Assert(len(createdCl.ContentLibrary.StorageClasses), Equals, 1)
-	check.Assert(createdCl.ContentLibrary.StorageClasses[0].ID, Equals, rsp.RegionStoragePolicy.Id)
+	check.Assert(createdCl.ContentLibrary.StorageClasses[0].ID, Equals, rsp.RegionStoragePolicy.ID)
 	check.Assert(createdCl.ContentLibrary.AutoAttach, Equals, clDefinition.AutoAttach)
 	// "Computed" values
 	check.Assert(createdCl.ContentLibrary.IsShared, Equals, true) // TODO: TM: Still not used in UI
@@ -63,7 +67,7 @@ func (vcd *TestVCD) Test_ContentLibraryProvider(check *C) {
 	check.Assert(err, IsNil)
 	check.Assert(len(cls), Equals, existingContentLibraryCount+1)
 	for _, l := range cls {
-		if l.ContentLibrary.Id == createdCl.ContentLibrary.Id {
+		if l.ContentLibrary.ID == createdCl.ContentLibrary.ID {
 			check.Assert(*l.ContentLibrary, DeepEquals, *createdCl.ContentLibrary)
 			break
 		}
@@ -74,7 +78,7 @@ func (vcd *TestVCD) Test_ContentLibraryProvider(check *C) {
 	check.Assert(cl, NotNil)
 	check.Assert(*cl.ContentLibrary, DeepEquals, *createdCl.ContentLibrary)
 
-	cl, err = vcd.client.GetContentLibraryById(cl.ContentLibrary.Id)
+	cl, err = vcd.client.GetContentLibraryById(cl.ContentLibrary.ID)
 	check.Assert(err, IsNil)
 	check.Assert(cl, NotNil)
 	check.Assert(*cl.ContentLibrary, DeepEquals, *createdCl.ContentLibrary)

govcd/tm_region_storage_policy.go

@@ -16,7 +16,7 @@ const labelRegionStoragePolicy = "Region Storage Policy"
 // RegionStoragePolicy defines the Region Storage Policy data structure
 type RegionStoragePolicy struct {
 	RegionStoragePolicy *types.RegionStoragePolicy
-	vcdClient           *VCDClient
+	client              *Client
 }
 
 // wrap is a hidden helper that facilitates the usage of a generic CRUD function
@@ -27,29 +27,32 @@ func (g RegionStoragePolicy) wrap(inner *types.RegionStoragePolicy) *RegionStora
 	return &g
 }
 
-// GetAllRegionStoragePolicies retrieves all Region Storage Policies with the given query parameters, which allow setting filters
+// GetAllStoragePolicies retrieves all Region Storage Policies with the given query parameters, which allow setting filters
 // and other constraints
-func (vcdClient *VCDClient) GetAllRegionStoragePolicies(queryParameters url.Values) ([]*RegionStoragePolicy, error) {
+func (r *Region) GetAllStoragePolicies(queryParameters url.Values) ([]*RegionStoragePolicy, error) {
+	return getAllStoragePolicies(r, queryParameters)
+}
+func getAllStoragePolicies(r *Region, queryParameters url.Values) ([]*RegionStoragePolicy, error) {
 	c := crudConfig{
 		entityLabel:     labelRegionStoragePolicy,
 		endpoint:        types.OpenApiPathVcf + types.OpenApiEndpointRegionStoragePolicies,
 		queryParameters: queryParameters,
 	}
 
-	outerType := RegionStoragePolicy{vcdClient: vcdClient}
-	return getAllOuterEntities(&vcdClient.Client, outerType, c)
+	outerType := RegionStoragePolicy{client: &r.vcdClient.Client}
+	return getAllOuterEntities(&r.vcdClient.Client, outerType, c)
 }
 
-// GetRegionStoragePolicyByName retrieves a Region Storage Policy by name
-func (vcdClient *VCDClient) GetRegionStoragePolicyByName(name string) (*RegionStoragePolicy, error) {
+// GetStoragePolicyByName retrieves a Region Storage Policy by name
+func (r *Region) GetStoragePolicyByName(name string) (*RegionStoragePolicy, error) {
 	if name == "" {
 		return nil, fmt.Errorf("%s lookup requires name", labelRegionStoragePolicy)
 	}
 
 	queryParams := url.Values{}
-	queryParams.Add("filter", "name=="+name)
+	queryParams.Add("filter", fmt.Sprintf("(name==%s;region.id==%s)", name, r.Region.ID))
 
-	filteredEntities, err := vcdClient.GetAllRegionStoragePolicies(queryParams)
+	filteredEntities, err := getAllStoragePolicies(r, queryParams)
 	if err != nil {
 		return nil, err
 	}
@@ -64,17 +67,26 @@ func (vcdClient *VCDClient) GetRegionStoragePolicyByName(name string) (*RegionSt
 	//	return nil, err
 	//}
 
-	return vcdClient.GetRegionStoragePolicyById(singleEntity.RegionStoragePolicy.Id)
+	return getStoragePolicyById(&r.vcdClient.Client, singleEntity.RegionStoragePolicy.ID)
+}
+
+// GetStoragePolicyById retrieves a Region Storage Policy by ID
+func (r *Region) GetStoragePolicyById(id string) (*RegionStoragePolicy, error) {
+	return getStoragePolicyById(&r.vcdClient.Client, id)
 }
 
 // GetRegionStoragePolicyById retrieves a Region Storage Policy by ID
 func (vcdClient *VCDClient) GetRegionStoragePolicyById(id string) (*RegionStoragePolicy, error) {
+	return getStoragePolicyById(&vcdClient.Client, id)
+}
+
+func getStoragePolicyById(client *Client, id string) (*RegionStoragePolicy, error) {
 	c := crudConfig{
 		entityLabel:    labelRegionStoragePolicy,
 		endpoint:       types.OpenApiPathVcf + types.OpenApiEndpointRegionStoragePolicies,
 		endpointParams: []string{id},
 	}
 
-	outerType := RegionStoragePolicy{vcdClient: vcdClient}
-	return getOuterEntity(&vcdClient.Client, outerType, c)
+	outerType := RegionStoragePolicy{client: client}
+	return getOuterEntity(client, outerType, c)
 }

govcd/tm_region_storage_policy_test.go

@@ -10,33 +10,35 @@ import (
 	. "gopkg.in/check.v1"
 )
 
-// TODO: TM: Missing Create, Update, Delete
 func (vcd *TestVCD) Test_RegionStoragePolicy(check *C) {
 	skipNonTm(vcd, check)
 	sysadminOnly(vcd, check)
 
-	allRegionStoragePolicies, err := vcd.client.GetAllRegionStoragePolicies(nil)
+	region, err := vcd.client.GetRegionByName(vcd.config.Tm.Region)
 	check.Assert(err, IsNil)
+	check.Assert(region, NotNil)
 
-	// TODO: TM: Once we can create Region SPs, we don't need the TM environment to have pre-existing Storage Policies
-	if len(allRegionStoragePolicies) == 0 {
-		check.Skip("didn't find any Region Storage Policy")
-	}
+	allRegionStoragePolicies, err := region.GetAllStoragePolicies(nil)
+	check.Assert(err, IsNil)
 
-	rspById, err := vcd.client.GetRegionStoragePolicyById(allRegionStoragePolicies[0].RegionStoragePolicy.Id)
+	rspById, err := region.GetStoragePolicyById(allRegionStoragePolicies[0].RegionStoragePolicy.ID)
 	check.Assert(err, IsNil)
 	check.Assert(*rspById.RegionStoragePolicy, DeepEquals, *allRegionStoragePolicies[0].RegionStoragePolicy)
 
-	rspByName, err := vcd.client.GetRegionStoragePolicyByName(allRegionStoragePolicies[0].RegionStoragePolicy.Name)
+	rspById2, err := vcd.client.GetRegionStoragePolicyById(allRegionStoragePolicies[0].RegionStoragePolicy.ID)
+	check.Assert(err, IsNil)
+	check.Assert(*rspById2.RegionStoragePolicy, DeepEquals, *rspById.RegionStoragePolicy)
+
+	rspByName, err := region.GetStoragePolicyByName(allRegionStoragePolicies[0].RegionStoragePolicy.Name)
 	check.Assert(err, IsNil)
 	check.Assert(*rspByName.RegionStoragePolicy, DeepEquals, *allRegionStoragePolicies[0].RegionStoragePolicy)
 
 	// Check ENF errors
-	_, err = vcd.client.GetRegionStoragePolicyById("urn:vcloud:regionStoragePolicy:aaaaaaaa-1111-0000-cccc-bbbb1111dddd")
+	_, err = region.GetStoragePolicyById("urn:vcloud:regionStoragePolicy:aaaaaaaa-1111-0000-cccc-bbbb1111dddd")
 	check.Assert(err, NotNil)
 	check.Assert(ContainsNotFound(err), Equals, true)
 
-	_, err = vcd.client.GetRegionStoragePolicyByName("NotExists")
+	_, err = region.GetStoragePolicyByName("NotExists")
 	check.Assert(err, NotNil)
 	check.Assert(ContainsNotFound(err), Equals, true)
 }

types/v56/tm.go

@@ -2,7 +2,7 @@ package types
 
 // RegionStoragePolicy defines a Region storage policy
 type RegionStoragePolicy struct {
-	Id string `json:"id,omitempty"`
+	ID string `json:"id,omitempty"`
 	// Name for the policy. It must follow RFC 1123 Label Names to conform with Kubernetes standards
 	Name string `json:"name"`
 	// The Region that this policy belongs to
@@ -34,7 +34,7 @@ type ContentLibrary struct {
 	// The description of the Content Library
 	Description string `json:"description,omitempty"`
 	// A unique identifier for the Content library
-	Id string `json:"id,omitempty"`
+	ID string `json:"id,omitempty"`
 	// Whether this Content Library is shared with other organizations
 	IsShared bool `json:"isShared,omitempty"`
 	// Whether this Content Library is subscribed from an external published library