Unit tests + status

Author: jwierzbo

pkg/apis/deployment/v1/deployment_status.go

@@ -103,6 +103,7 @@ type DeploymentStatus struct {
 Coordinators *ServerGroupStatus `json:"coordinators,omitempty"`
 SyncMasters *ServerGroupStatus `json:"syncmasters,omitempty"`
 SyncWorkers *ServerGroupStatus `json:"syncworkers,omitempty"`
+Gateways *ServerGroupStatus `json:"gateways,omitempty"`
 }
 
 // Equal checks for equality
@@ -174,6 +175,8 @@ func (ds DeploymentStatus) getServerGroupStatus(group ServerGroup) *ServerGroupS
 return ds.SyncMasters.DeepCopy()
 case ServerGroupSyncWorkers:
 return ds.SyncWorkers.DeepCopy()
+case ServerGroupGateways:
+return ds.Gateways.DeepCopy()
 default:
 return nil
 }
@@ -195,5 +198,7 @@ func (ds *DeploymentStatus) UpdateServerGroupStatus(group ServerGroup, gspec Ser
 ds.SyncMasters = &gspec
 case ServerGroupSyncWorkers:
 ds.SyncWorkers = &gspec
+case ServerGroupGateways:
+ds.Gateways = &gspec
 }
 }

pkg/apis/deployment/v1/deployment_status_members_test.go

@@ -34,6 +34,7 @@ func newMemberList() DeploymentStatusMembers {
 Coordinators: MemberStatusList{{ID: ServerGroupCoordinators.AsRole()}},
 SyncMasters: MemberStatusList{{ID: ServerGroupSyncMasters.AsRole()}},
 SyncWorkers: MemberStatusList{{ID: ServerGroupSyncWorkers.AsRole()}},
+Gateways: MemberStatusList{{ID: ServerGroupGateways.AsRole()}},
 }
 }
 

pkg/apis/deployment/v1/server_group_spec_test.go

@@ -46,6 +46,7 @@ func TestServerGroupSpecValidateCount(t *testing.T) {
 assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](2)}.New().WithGroup(ServerGroupCoordinators).New().Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentProduction))
 assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](2)}.New().WithGroup(ServerGroupSyncMasters).New().Validate(ServerGroupSyncMasters, true, DeploymentModeCluster, EnvironmentProduction))
 assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](2)}.New().WithGroup(ServerGroupSyncWorkers).New().Validate(ServerGroupSyncWorkers, true, DeploymentModeCluster, EnvironmentProduction))
+assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](2)}.New().WithGroup(ServerGroupGateways).New().Validate(ServerGroupGateways, true, DeploymentModeCluster, EnvironmentProduction))
 
 assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](2), MinCount: util.NewType[int](2), MaxCount: util.NewType[int](5)}.New().WithGroup(ServerGroupCoordinators).New().Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
 assert.Nil(t, ServerGroupSpec{Count: util.NewType[int](1), MaxCount: util.NewType[int](5)}.New().WithGroup(ServerGroupCoordinators).New().Validate(ServerGroupCoordinators, true, DeploymentModeCluster, EnvironmentDevelopment))
@@ -112,6 +113,10 @@ func TestServerGroupSpecDefault(t *testing.T) {
 assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupSyncWorkers, false, DeploymentModeActiveFailover).New().GetCount())
 assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupSyncWorkers, true, DeploymentModeCluster).New().GetCount())
 
+assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupGateways, false, DeploymentModeSingle).New().GetCount())
+assert.Equal(t, 0, def(ServerGroupSpec{}, ServerGroupGateways, false, DeploymentModeActiveFailover).New().GetCount())
+assert.Equal(t, 3, def(ServerGroupSpec{}, ServerGroupGateways, true, DeploymentModeCluster).New().GetCount())
+
 for _, g := range AllServerGroups {
 assert.Equal(t, 0, len(def(ServerGroupSpec{}, g, true, DeploymentModeSingle).Args))
 assert.Equal(t, "", def(ServerGroupSpec{}, g, true, DeploymentModeSingle).New().GetStorageClassName())

pkg/apis/deployment/v1/server_group_test.go

@@ -33,6 +33,7 @@ func TestServerGroupAsRole(t *testing.T) {
 assert.Equal(t, "coordinator", ServerGroupCoordinators.AsRole())
 assert.Equal(t, "syncmaster", ServerGroupSyncMasters.AsRole())
 assert.Equal(t, "syncworker", ServerGroupSyncWorkers.AsRole())
+assert.Equal(t, "gateways", ServerGroupGateways.AsRole())
 }
 
 func TestServerGroupAsRoleAbbreviated(t *testing.T) {
@@ -42,6 +43,7 @@ func TestServerGroupAsRoleAbbreviated(t *testing.T) {
 assert.Equal(t, "crdn", ServerGroupCoordinators.AsRoleAbbreviated())
 assert.Equal(t, "syma", ServerGroupSyncMasters.AsRoleAbbreviated())
 assert.Equal(t, "sywo", ServerGroupSyncWorkers.AsRoleAbbreviated())
+assert.Equal(t, "gway", ServerGroupGateways.AsRoleAbbreviated())
 }
 
 func TestServerGroupIsArangod(t *testing.T) {
@@ -51,6 +53,7 @@ func TestServerGroupIsArangod(t *testing.T) {
 assert.True(t, ServerGroupCoordinators.IsArangod())
 assert.False(t, ServerGroupSyncMasters.IsArangod())
 assert.False(t, ServerGroupSyncWorkers.IsArangod())
+assert.False(t, ServerGroupGateways.IsArangod())
 }
 
 func TestServerGroupIsArangosync(t *testing.T) {
@@ -60,6 +63,7 @@ func TestServerGroupIsArangosync(t *testing.T) {
 assert.False(t, ServerGroupCoordinators.IsArangosync())
 assert.True(t, ServerGroupSyncMasters.IsArangosync())
 assert.True(t, ServerGroupSyncWorkers.IsArangosync())
+assert.False(t, ServerGroupGateways.IsArangosync())
 }
 
 func TestServerGroupType(t *testing.T) {

pkg/deployment/reconcile/plan_builder_rotate_upgrade.go

@@ -49,6 +49,7 @@ var (
 api.ServerGroupDBServers,
 api.ServerGroupSyncMasters,
 api.ServerGroupSyncWorkers,
+api.ServerGroupGateways,
 }
 )