Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ECOPROJECT-2080: Add MTV operator as an option to cluster post installation #6711

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions internal/cluster/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ var _ = Describe("stateMachine", func() {
{Status: api.Success, ValidationId: string(models.ClusterValidationIDCnvRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLvmRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMceRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMtvRequirementsSatisfied)},
}, nil)
})

Expand Down Expand Up @@ -161,6 +162,7 @@ var _ = Describe("TestClusterMonitoring", func() {
{Status: api.Success, ValidationId: string(models.ClusterValidationIDCnvRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLvmRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMceRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMtvRequirementsSatisfied)},
}, nil)
})

Expand Down Expand Up @@ -749,6 +751,7 @@ var _ = Describe("lease timeout event", func() {
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLsoRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLvmRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMceRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMtvRequirementsSatisfied)},
}, nil)
})

Expand Down Expand Up @@ -865,6 +868,7 @@ var _ = Describe("Auto assign machine CIDR", func() {
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLsoRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLvmRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMceRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMtvRequirementsSatisfied)},
}, nil)
})

Expand Down Expand Up @@ -2561,6 +2565,7 @@ var _ = Describe("ready_state", func() {
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLsoRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDLvmRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMceRequirementsSatisfied)},
{Status: api.Success, ValidationId: string(models.ClusterValidationIDMtvRequirementsSatisfied)},
}, nil)
})

Expand Down
1 change: 1 addition & 0 deletions internal/cluster/statemachine.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ func NewClusterStateMachine(th TransitionHandler) stateswitch.StateMachine {
If(IsCnvRequirementsSatisfied),
If(IsLvmRequirementsSatisfied),
If(IsMceRequirementsSatisfied),
If(IsMtvRequirementsSatisfied),
If(isNetworkTypeValid),
If(NetworksSameAddressFamilies),
)
Expand Down
3 changes: 2 additions & 1 deletion internal/cluster/validation_id.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const (
IsCnvRequirementsSatisfied = ValidationID(models.ClusterValidationIDCnvRequirementsSatisfied)
IsLvmRequirementsSatisfied = ValidationID(models.ClusterValidationIDLvmRequirementsSatisfied)
IsMceRequirementsSatisfied = ValidationID(models.ClusterValidationIDMceRequirementsSatisfied)
IsMtvRequirementsSatisfied = ValidationID(models.ClusterValidationIDMtvRequirementsSatisfied)
PlatformRequirementsSatisfied = ValidationID(models.ClusterValidationIDPlatformRequirementsSatisfied)
)

Expand All @@ -46,7 +47,7 @@ func (v ValidationID) Category() (string, error) {
return "hosts-data", nil
case IsPullSecretSet, PlatformRequirementsSatisfied:
return "configuration", nil
case IsOdfRequirementsSatisfied, IsLsoRequirementsSatisfied, IsCnvRequirementsSatisfied, IsLvmRequirementsSatisfied, IsMceRequirementsSatisfied:
case IsOdfRequirementsSatisfied, IsLsoRequirementsSatisfied, IsCnvRequirementsSatisfied, IsLvmRequirementsSatisfied, IsMceRequirementsSatisfied, IsMtvRequirementsSatisfied:
return "operators", nil
}
return "", common.NewApiError(http.StatusInternalServerError, errors.Errorf("Unexpected cluster validation id %s", string(v)))
Expand Down
1 change: 1 addition & 0 deletions internal/featuresupport/feature_support_level.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ var featuresList = map[models.FeatureSupportLevelID]SupportLevelFeature{
models.FeatureSupportLevelIDLSO: (&LsoFeature{}).New(),
models.FeatureSupportLevelIDMCE: (&MceFeature{}).New(),
models.FeatureSupportLevelIDODF: (&OdfFeature{}).New(),
models.FeatureSupportLevelIDMTV: (&MtvFeature{}).New(),

// Platform features
models.FeatureSupportLevelIDNUTANIXINTEGRATION: (&NutanixIntegrationFeature{}).New(),
Expand Down
6 changes: 3 additions & 3 deletions internal/featuresupport/feature_support_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,19 +269,19 @@ var _ = Describe("V2ListFeatureSupportLevels API", func() {
When("GetFeatureSupportList 4.12 with Platform", func() {
It(string(*filters.PlatformType)+" "+swag.StringValue(filters.ExternalPlatformName), func() {
list := GetFeatureSupportList("dummy", nil, filters.PlatformType, filters.ExternalPlatformName)
Expect(len(list)).To(Equal(19))
Expect(len(list)).To(Equal(20))
})
})
}

It("GetFeatureSupportList 4.12", func() {
list := GetFeatureSupportList("4.12", nil, nil, nil)
Expect(len(list)).To(Equal(24))
Expect(len(list)).To(Equal(25))
})

It("GetFeatureSupportList 4.13", func() {
list := GetFeatureSupportList("4.13", nil, nil, nil)
Expect(len(list)).To(Equal(24))
Expect(len(list)).To(Equal(25))
})

It("GetCpuArchitectureSupportList 4.12", func() {
Expand Down
Loading