-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into features/refactored-hap-doc
- Loading branch information
Showing
15 changed files
with
406 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1877,3 +1877,57 @@ func TestProvisioning_Modules(t *testing.T) { | |
| assert.Equal(t, http.StatusBadRequest, resp.StatusCode) | ||
| }) | ||
| } | ||
|
|
||
| func TestProvisioningWithAdditionalWorkerNodePools(t *testing.T) { | ||
| //given | ||
| cfg := fixConfig() | ||
| cfg.Broker.KimConfig.Enabled = true | ||
| cfg.Broker.KimConfig.Plans = []string{"preview"} | ||
| cfg.Broker.KimConfig.KimOnlyPlans = []string{"preview"} | ||
|
|
||
| suite := NewBrokerSuiteTestWithConfig(t, cfg) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
|
|
||
| // when | ||
| resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/cf-eu21/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster", | ||
| "region": "eu-central-1", | ||
| "additionalWorkerNodePools": [ | ||
| { | ||
| "name": "name-1", | ||
| "machineType": "m6i.large", | ||
| "haZones": true, | ||
| "autoScalerMin": 3, | ||
| "autoScalerMax": 20 | ||
| }, | ||
| { | ||
| "name": "name-2", | ||
| "machineType": "m5.large", | ||
| "haZones": false, | ||
| "autoScalerMin": 1, | ||
| "autoScalerMax": 1 | ||
| } | ||
| ] | ||
| } | ||
| }`) | ||
|
|
||
| opID := suite.DecodeOperationID(resp) | ||
| suite.processKIMOnlyProvisioningByOperationID(opID) | ||
|
|
||
| // then | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
| runtime := suite.GetRuntimeResourceByInstanceID(iid) | ||
| assert.Len(t, *runtime.Spec.Shoot.Provider.AdditionalWorkers, 2) | ||
| suite.assertAdditionalWorkerIsCreated(t, runtime.Spec.Shoot.Provider, "name-1", "m6i.large", 3, 20, 3) | ||
| suite.assertAdditionalWorkerIsCreated(t, runtime.Spec.Shoot.Provider, "name-2", "m5.large", 1, 1, 1) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2526,3 +2526,197 @@ func TestUpdateErsContextAndParamsForExpiredInstance(t *testing.T) { | |
| }`) | ||
| assert.Equal(t, http.StatusBadRequest, response.StatusCode) | ||
| } | ||
|
|
||
| func TestUpdateAdditionalWorkerNodePools(t *testing.T) { | ||
| t.Run("should add additional worker node pools", func(t *testing.T) { | ||
| // given | ||
| suite := NewBrokerSuiteTest(t) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
|
|
||
| resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true&plan_id=7d55d31d-35ae-4438-bf13-6ffdfa107d9f&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster", | ||
| "region": "eu-central-1" | ||
| } | ||
| }`) | ||
| opID := suite.DecodeOperationID(resp) | ||
| suite.waitForRuntimeAndMakeItReady(opID) | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| // when | ||
| // OSB update: | ||
| resp = suite.CallAPI("PATCH", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "additionalWorkerNodePools": [ | ||
| { | ||
| "name": "name-1", | ||
| "machineType": "m6i.large", | ||
| "haZones": true, | ||
| "autoScalerMin": 3, | ||
| "autoScalerMax": 20 | ||
| }, | ||
| { | ||
| "name": "name-2", | ||
| "machineType": "m5.large", | ||
| "haZones": false, | ||
| "autoScalerMin": 4, | ||
| "autoScalerMax": 21 | ||
| } | ||
| ] | ||
| } | ||
| }`) | ||
| assert.Equal(t, http.StatusAccepted, resp.StatusCode) | ||
| upgradeOperationID := suite.DecodeOperationID(resp) | ||
|
|
||
| // then | ||
| suite.WaitForOperationState(upgradeOperationID, domain.Succeeded) | ||
| runtime := suite.GetRuntimeResourceByInstanceID(iid) | ||
| assert.Len(t, *runtime.Spec.Shoot.Provider.AdditionalWorkers, 2) | ||
| suite.assertAdditionalWorkerIsCreated(t, runtime.Spec.Shoot.Provider, "name-1", "m6i.large", 3, 20, 3) | ||
| suite.assertAdditionalWorkerIsCreated(t, runtime.Spec.Shoot.Provider, "name-2", "m5.large", 4, 21, 1) | ||
| }) | ||
|
|
||
| t.Run("should replace additional worker node pools", func(t *testing.T) { | ||
| // given | ||
| suite := NewBrokerSuiteTest(t) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
|
|
||
| resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true&plan_id=7d55d31d-35ae-4438-bf13-6ffdfa107d9f&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster", | ||
| "region": "eu-central-1", | ||
| "additionalWorkerNodePools": [ | ||
| { | ||
| "name": "name-1", | ||
| "machineType": "m6i.large", | ||
| "haZones": true, | ||
| "autoScalerMin": 3, | ||
| "autoScalerMax": 20 | ||
| } | ||
| ] | ||
| } | ||
| }`) | ||
| opID := suite.DecodeOperationID(resp) | ||
| suite.waitForRuntimeAndMakeItReady(opID) | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| // when | ||
| // OSB update: | ||
| resp = suite.CallAPI("PATCH", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "additionalWorkerNodePools": [ | ||
| { | ||
| "name": "name-2", | ||
| "machineType": "m5.large", | ||
| "haZones": true, | ||
| "autoScalerMin": 4, | ||
| "autoScalerMax": 21 | ||
| } | ||
| ] | ||
| } | ||
| }`) | ||
| assert.Equal(t, http.StatusAccepted, resp.StatusCode) | ||
| upgradeOperationID := suite.DecodeOperationID(resp) | ||
|
|
||
| // then | ||
| suite.WaitForOperationState(upgradeOperationID, domain.Succeeded) | ||
| runtime := suite.GetRuntimeResourceByInstanceID(iid) | ||
| assert.Len(t, *runtime.Spec.Shoot.Provider.AdditionalWorkers, 1) | ||
| suite.assertAdditionalWorkerIsCreated(t, runtime.Spec.Shoot.Provider, "name-2", "m5.large", 4, 21, 3) | ||
| }) | ||
|
|
||
| t.Run("should remove additional worker node pools when list is empty", func(t *testing.T) { | ||
| // given | ||
| suite := NewBrokerSuiteTest(t) | ||
| defer suite.TearDown() | ||
| iid := uuid.New().String() | ||
|
|
||
| resp := suite.CallAPI("PUT", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true&plan_id=7d55d31d-35ae-4438-bf13-6ffdfa107d9f&service_id=47c9dcbf-ff30-448e-ab36-d3bad66ba281", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "subaccount_id": "sub-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "name": "testing-cluster", | ||
| "region": "eu-central-1", | ||
| "additionalWorkerNodePools": [ | ||
| { | ||
| "name": "name-1", | ||
| "machineType": "m6i.large", | ||
| "haZones": false, | ||
| "autoScalerMin": 3, | ||
| "autoScalerMax": 20 | ||
| }, | ||
| { | ||
| "name": "name-2", | ||
| "machineType": "m5.large", | ||
| "haZones": false, | ||
| "autoScalerMin": 4, | ||
| "autoScalerMax": 21 | ||
| } | ||
| ] | ||
| } | ||
| }`) | ||
| opID := suite.DecodeOperationID(resp) | ||
| suite.waitForRuntimeAndMakeItReady(opID) | ||
| suite.WaitForOperationState(opID, domain.Succeeded) | ||
|
|
||
| // when | ||
| // OSB update: | ||
| resp = suite.CallAPI("PATCH", fmt.Sprintf("oauth/cf-eu10/v2/service_instances/%s?accepts_incomplete=true", iid), | ||
| `{ | ||
| "service_id": "47c9dcbf-ff30-448e-ab36-d3bad66ba281", | ||
| "plan_id": "5cb3d976-b85c-42ea-a636-79cadda109a9", | ||
| "context": { | ||
| "globalaccount_id": "g-account-id", | ||
| "user_id": "[email protected]" | ||
| }, | ||
| "parameters": { | ||
| "additionalWorkerNodePools": [] | ||
| } | ||
| }`) | ||
| assert.Equal(t, http.StatusAccepted, resp.StatusCode) | ||
| upgradeOperationID := suite.DecodeOperationID(resp) | ||
|
|
||
| // then | ||
| suite.WaitForOperationState(upgradeOperationID, domain.Succeeded) | ||
| runtime := suite.GetRuntimeResourceByInstanceID(iid) | ||
| assert.Len(t, *runtime.Spec.Shoot.Provider.AdditionalWorkers, 0) | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.