Merge pull request #1830 from afumagalli98/1824

Removed cluster veritas hijacked

Author: afumagalli98

api-service/service/databases.go

@@ -884,17 +884,6 @@ licenses:
 			return nil, err
 		}
 
-		usedlicense := v
-
-		if usedlicense.LicenseTypeID == "L47837" && usedlicense.ClusterType == "VeritasCluster" {
-			used := float64(len(strings.Split(usedlicense.ClusterName, ",")))
-			usedlicense.ClusterLicenses = used
-		}
-
-		if clusterLicenses == 0 {
-			clusterLicenses = usedlicense.ClusterLicenses
-		}
-
 		licensesPerHost = append(licensesPerHost,
 			dto.DatabaseUsedLicensePerHost{
 				Hostname:        v.Hostname,

model/hostdata_be.go

@@ -47,14 +47,14 @@ type HostDataBE struct {
 	Clusters                []ClusterInfo           `json:"clusters" bson:"clusters"`
 	Cloud                   Cloud                   `json:"cloud" bson:"cloud"`
 	Errors                  []AgentError            `json:"errors" bson:"errors"`
-	CpuConsumptions            []CpuConsumption        `json:"cpuConsumptions"`
+	CpuConsumptions         []CpuConsumption        `json:"cpuConsumptions"`
 	DiskConsumptions        []DiskConsumption       `json:"diskConsumptions"`
 }
 
 func (v *HostDataBE) GetClusterCores(hostdatasPerHostname map[string]*HostDataBE) (int, error) {
 	cms := v.ClusterMembershipStatus
 	if !cms.VeritasClusterServer ||
-		(cms.VeritasClusterServer && len(cms.VeritasClusterHostnames) <= 2) {
+		(cms.VeritasClusterServer && len(cms.VeritasClusterHostnames) < 2) {
 		return 0, utils.ErrHostNotInCluster
 	}