Merge branch 'master' into bugfix/OM-86907

turbonomic · Jun 30, 2022 · 2d6a43a · 2d6a43a
2 parents d67a87f + 5e8ddac
commit 2d6a43a
Show file tree

Hide file tree

Showing 17 changed files with 1,103 additions and 990 deletions.
diff --git a/pkg/builder/group/group_builder_test.go b/pkg/builder/group/group_builder_test.go
@@ -97,7 +97,7 @@ func TestGroupBuilderDynamic(t *testing.T) {
 
 	groupBuilder := DynamicRegularGroup(id).
 		OfType(eType).
-		MatchingEntities(SelectedBy(selectionSpec).and(selectionSpec2))
+		MatchingEntities(SelectedBy(selectionSpec).And(selectionSpec2))
 
 	groupDTO, err := groupBuilder.Build()
 	assert.Nil(t, err)

diff --git a/pkg/builder/group/policy_builder_test.go b/pkg/builder/group/policy_builder_test.go
@@ -294,7 +294,7 @@ func TestPlaceTogetherPolicy(t *testing.T) {
 		SetProperty("3333-")
 
 	placeTogetherPolicyBuilder := PlaceTogether(id).
-		WithBuyers(DynamicBuyers(SelectedBy(selectionSpec1).and(selectionSpec2)).OfType(eType)).
+		WithBuyers(DynamicBuyers(SelectedBy(selectionSpec1).And(selectionSpec2)).OfType(eType)).
 		OnSellerType(proto.EntityDTO_CONTAINER_POD)
 
 	groupDTOList, _ := assertPlaceTogetherPolicyConditions(t, placeTogetherPolicyBuilder)
@@ -304,7 +304,7 @@ func TestPlaceTogetherPolicy(t *testing.T) {
 
 	// Invalid buyer group
 	placeTogetherPolicyBuilder = PlaceTogether(id).
-		WithBuyers(DynamicBuyers(SelectedBy(selectionSpec1).and(selectionSpec2)))
+		WithBuyers(DynamicBuyers(SelectedBy(selectionSpec1).And(selectionSpec2)))
 
 	isValidBuyerData := assertValidBuyerData(t, placeTogetherPolicyBuilder.buyerData)
 	assert.Equal(t, false, isValidBuyerData)

diff --git a/pkg/builder/group/selection_builder.go b/pkg/builder/group/selection_builder.go
@@ -23,7 +23,7 @@ func SelectedBy(entitySpec SelectionSpecBuilder) *Matching {
 	}
 	return matching
 }
-func (matching *Matching) and(entitySpec SelectionSpecBuilder) *Matching {
+func (matching *Matching) And(entitySpec SelectionSpecBuilder) *Matching {
 	matching.selectionSpecBuilderList = append(matching.selectionSpecBuilderList, entitySpec)
 	return matching
 }

diff --git a/pkg/builder/group/settings_policy_builder.go b/pkg/builder/group/settings_policy_builder.go
@@ -82,3 +82,80 @@ func NewResizeAutomationPolicySetting(actionCapability string) *proto.GroupDTO_S
 		},
 	}
 }
+
+func NewHorizontalScaleUpAutomationPolicySetting(actionMode string) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_HORIZONTAL_SCALE_UP_AUTOMATION_MODE.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_StringSettingValueType_{
+			StringSettingValueType: &proto.GroupDTO_Setting_StringSettingValueType{
+				Value: &actionMode,
+			},
+		},
+	}
+}
+
+func NewHorizontalScaleDownAutomationPolicySetting(actionMode string) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_HORIZONTAL_SCALE_DOWN_AUTOMATION_MODE.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_StringSettingValueType_{
+			StringSettingValueType: &proto.GroupDTO_Setting_StringSettingValueType{
+				Value: &actionMode,
+			},
+		},
+	}
+}
+
+func NewMoveAutomationPolicySetting(actionMode string) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_MOVE_AUTOMATION_MODE.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_StringSettingValueType_{
+			StringSettingValueType: &proto.GroupDTO_Setting_StringSettingValueType{
+				Value: &actionMode,
+			},
+		},
+	}
+}
+
+func NewMinReplicasPolicySetting(minReplicas float32) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_MIN_REPLICAS.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType_{
+			NumericSettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType{
+				Value: &minReplicas,
+			},
+		},
+	}
+}
+
+func NewMaxReplicasPolicySetting(maxReplicas float32) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_MAX_REPLICAS.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType_{
+			NumericSettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType{
+				Value: &maxReplicas,
+			},
+		},
+	}
+}
+
+func NewResponseTimeSLOPolicySetting(responseTimeSLO float32) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_RESPONSE_TIME_SLO.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType_{
+			NumericSettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType{
+				Value: &responseTimeSLO,
+			},
+		},
+	}
+}
+
+func NewTransactionSLOPolicySetting(transactionSLO float32) *proto.GroupDTO_Setting {
+	return &proto.GroupDTO_Setting{
+		Type: proto.GroupDTO_Setting_TRANSACTION_SLO.Enum(),
+		SettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType_{
+			NumericSettingValueType: &proto.GroupDTO_Setting_NumericSettingValueType{
+				Value: &transactionSLO,
+			},
+		},
+	}
+}
diff --git a/pkg/proto/ActionExecution.pb.go b/pkg/proto/ActionExecution.pb.go
diff --git a/pkg/proto/CloudCostDTO.pb.go b/pkg/proto/CloudCostDTO.pb.go
diff --git a/pkg/proto/CommonCost.pb.go b/pkg/proto/CommonCost.pb.go