Merge pull request #712 from fabriziosestito/skip_non_dc_cluster_proj…

…ection Skip non dc cluster projection
trento-project · Jan 18, 2022 · c411c33 · c411c33
2 parents d40663f + c82243a
commit c411c33
Show file tree

Hide file tree

Showing 5 changed files with 1,025 additions and 1,015 deletions.
diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go
@@ -39,6 +39,7 @@ type Cluster struct {
 	SBD    SBD         `mapstructure:"sbd,omitempty"`
 	Id     string      `mapstructure:"id"`
 	Name   string      `mapstructure:"name"`
+	DC     bool        `mapstructure:"dc"`
 }
 
 func NewCluster() (Cluster, error) {
@@ -89,6 +90,8 @@ func NewClusterWithDiscoveryTools(discoveryTools *DiscoveryTools) (Cluster, erro
 		cluster.SBD = sbdData
 	}
 
+	cluster.DC = isDC(&cluster)
+
 	return cluster, nil
 }
 
@@ -108,7 +111,7 @@ func getName(c Cluster) string {
 	return ""
 }
 
-func (c *Cluster) IsDc() bool {
+func isDC(c *Cluster) bool {
 	host, _ := os.Hostname()
 
 	for _, nodes := range c.Crmmon.Nodes {

diff --git a/internal/cluster/cluster_test.go b/internal/cluster/cluster_test.go
@@ -78,43 +78,43 @@ func TestIsDC(t *testing.T) {
 
 	root.Configuration.CrmConfig = crmConfig
 
-	c := Cluster{
+	c := &Cluster{
 		Cib: *root,
 		Crmmon: crmmon.Root{
 			Version: "1.2.3",
 			Nodes: []crmmon.Node{
-				crmmon.Node{
+				{
 					Name: "othernode",
 					DC:   false,
 				},
-				crmmon.Node{
+				{
 					Name: host,
 					DC:   true,
 				},
 			},
 		},
 	}
 
-	assert.Equal(t, true, c.IsDc())
+	assert.Equal(t, true, isDC(c))
 
-	c = Cluster{
+	c = &Cluster{
 		Cib: *root,
 		Crmmon: crmmon.Root{
 			Version: "1.2.3",
 			Nodes: []crmmon.Node{
-				crmmon.Node{
+				{
 					Name: "othernode",
 					DC:   true,
 				},
-				crmmon.Node{
+				{
 					Name: host,
 					DC:   false,
 				},
 			},
 		},
 	}
 
-	assert.Equal(t, false, c.IsDc())
+	assert.Equal(t, false, isDC(c))
 }
 
 func TestIsFencingEnabled(t *testing.T) {

diff --git a/test/fixtures/discovery/cluster/cluster_discovery_hana_scale_up.json b/test/fixtures/discovery/cluster/cluster_discovery_hana_scale_up.json
@@ -856,5 +856,6 @@
         }
       ]
     }
-  }
+  },
+  "DC": true
 }