addressing the comments

HewlettPackard · Jun 6, 2022 · 6ad9705 · 6ad9705
1 parent 01d68fd
commit 6ad9705
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/pkg/client/api.go b/pkg/client/api.go
@@ -50,7 +50,6 @@ func (a *api) do(ctx context.Context, request interface{}, queryParams map[strin
 		panic("api not properly configured")
 	}
 	a.path = fmt.Sprintf("%s/%s/%s", a.client.getHost(), consts.VmaasCmpAPIBasePath, a.path)
-	// a.path = fmt.Sprintf("%s/%s", a.client.getHost(), a.path)
 
 	for _, validations := range a.validations {
 		err := validations()

diff --git a/pkg/client/instances_test.go b/pkg/client/instances_test.go
@@ -64,7 +64,7 @@ func TestInstancesAPIService_CloneAnInstance(t *testing.T) {
 					Name:  "Instance_Clone",
 				}
 				// pBody := []byte(`{"zoneId":"1","CloneName":"Instance_Clone"}`)
-				m.EXPECT().getVersion().Return(999999).AnyTimes()
+				m.EXPECT().getVersion().Return(999999).MaxTimes(3)
 				m.EXPECT().prepareRequest(gomock.Any(), path, method, pBody, headers, url.Values{},
 					url.Values{}, "", nil).Return(req, nil)
 
@@ -99,7 +99,7 @@ func TestInstancesAPIService_CloneAnInstance(t *testing.T) {
 					Name:  "Instance_Clone",
 				}
 				// pBody := []byte(`{"ZoneID":"1","CloneName":"Instance_Clone"}`)
-				m.EXPECT().getVersion().Return(999999).AnyTimes()
+				m.EXPECT().getVersion().Return(999999).MaxTimes(3)
 				m.EXPECT().prepareRequest(gomock.Any(), path, method, pBody, headers, url.Values{},
 					url.Values{}, "", nil).Return(nil, errors.New("prepare request error"))
 			},
@@ -144,7 +144,7 @@ func TestInstancesAPIService_CloneAnInstance(t *testing.T) {
 					},
 					Name: "Instance_Clone",
 				}
-				m.EXPECT().getVersion().Return(999999).AnyTimes()
+				m.EXPECT().getVersion().Return(999999).MaxTimes(3)
 				m.EXPECT().prepareRequest(gomock.Any(), path, method, pBody, headers, url.Values{},
 					url.Values{}, "", nil).Return(req, nil)
 

diff --git a/pkg/client/power_schedule.go b/pkg/client/power_schedule.go
@@ -31,7 +31,7 @@ func (a *PowerSchedulesAPIService) GetAllPowerSchedules(ctx context.Context,
 
 	allPowerScheduleAPI := &api{
 		method: "GET",
-		path:   consts.PowerSchedulPath,
+		path:   consts.PowerSchedulePath,
 		client: a.Client,
 
 		jsonParser: func(body []byte) error {
@@ -51,7 +51,7 @@ func (a *PowerSchedulesAPIService) GetSpecificPowerSchedule(
 
 	allPowerScheduleAPI := &api{
 		method: "GET",
-		path:   fmt.Sprintf("%s/%d", consts.PowerSchedulPath, powerID),
+		path:   fmt.Sprintf("%s/%d", consts.PowerSchedulePath, powerID),
 		client: a.Client,
 
 		jsonParser: func(body []byte) error {

diff --git a/pkg/common/constants.go b/pkg/common/constants.go
@@ -49,15 +49,15 @@ const (
 	VirtualImagePath               = "virtual-images"
 	FolderPath                     = "folders"
 	ConfigOptionPath               = "config-options"
-	PowerSchedulPath               = "power-schedules"
+	PowerSchedulePath              = "power-schedules"
 	EnvironmentPath                = "environments"
 	OptionsPath                    = "options"
 	ZoneNetworkOptionsPath         = "zoneNetworkOptions"
 	ProvisionTypesPath             = "provision-types"
 	RouterRoutePath                = "routes"
 	RouterBgpNeighborPath          = "bgp-neighbors"
 	NetworkEdgeClusterPath         = "edge-clusters"
-
+	// Whoami Path
 	WhoamiPath = "whoami"
 
 	// headers