Gilad Chaplik has uploaded a new change for review.
Change subject: engine: rename PolicyUnitType enum values
......................................................................
engine: rename PolicyUnitType enum values
To upper case.
Mixture of upper and lower case letters are probably bad practice.
Anyway RESTful project likes it better.
Change-Id: I569ac0f9bf60d7496fc24a3532217af4770d2fa7
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
M
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
11 files changed, 40 insertions(+), 40 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/92/28092/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
index be1ae71..58ea19a 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/PolicyUnitImpl.java
@@ -50,58 +50,58 @@
case "Network":
return new NetworkPolicyUnit(policyUnit);
case "HA":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new HostedEngineHAClusterWeightPolicyUnit(policyUnit);
- } else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.Filter) {
+ } else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.FILTER) {
return new HostedEngineHAClusterFilterPolicyUnit(policyUnit);
}
break;
case "OptimalForHaReservation":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new HaReservationWeightPolicyUnit(policyUnit);
}
- else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
return new HaReservationBalancePolicyUnit(policyUnit);
}
break;
case "CPU-Level":
return new CpuLevelFilterPolicyUnit(policyUnit);
case "None":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new NoneWeightPolicyUnit(policyUnit);
}
- else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
return new NoneBalancePolicyUnit(policyUnit);
}
break;
case "OptimalForPowerSaving":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new PowerSavingWeightPolicyUnit(policyUnit);
}
- else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
return new PowerSavingBalancePolicyUnit(policyUnit);
}
break;
case "OptimalForEvenDistribution":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new EvenDistributionWeightPolicyUnit(policyUnit);
}
- else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
return new EvenDistributionBalancePolicyUnit(policyUnit);
}
break;
case "OptimalForEvenGuestDistribution":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
return new
EvenGuestDistributionWeightPolicyUnit(policyUnit);
}
- else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
return new
EvenGuestDistributionBalancePolicyUnit(policyUnit);
}
break;
case "VmAffinityGroups":
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Filter) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.FILTER) {
return new VmAffinityFilterPolicyUnit(policyUnit);
- } else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.Weight) {
+ } else if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.WEIGHT) {
return new VmAffinityWeightPolicyUnit(policyUnit);
}
default:
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
index 9c03e26..914c0ee 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/SchedulingManager.java
@@ -881,13 +881,13 @@
if (policyUnit != null) {
for (ClusterPolicy clusterPolicy : policyMap.values()) {
switch (policyUnit.getPolicyUnitType()) {
- case Filter:
+ case FILTER:
Collection<Guid> filters = clusterPolicy.getFilters();
if (filters != null && filters.contains(policyUnitId)) {
list.add(clusterPolicy.getName());
}
break;
- case Weight:
+ case WEIGHT:
Collection<Pair<Guid, Integer>> functions =
clusterPolicy.getFunctions();
if (functions == null) {
break;
@@ -899,7 +899,7 @@
}
}
break;
- case LoadBalancing:
+ case LOAD_BALANCING:
if (policyUnitId.equals(clusterPolicy.getBalance())) {
list.add(clusterPolicy.getName());
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
index 5b1efd6..266babf 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/commands/ClusterPolicyCRUDCommand.java
@@ -47,7 +47,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.Filter) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.FILTER) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_FILTER_NOT_IMPLEMENTED);
}
}
@@ -79,7 +79,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.Weight) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.WEIGHT) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_FUNCTION_NOT_IMPLEMENTED);
}
if (functionPair.getSecond() < 0) {
@@ -93,7 +93,7 @@
if (policyUnitImpl == null) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_UNKNOWN_POLICY_UNIT);
}
- if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.LoadBalancing) {
+ if (policyUnitImpl.getPolicyUnit().getPolicyUnitType() !=
PolicyUnitType.LOAD_BALANCING) {
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_CLUSTER_POLICY_BALANCE_NOT_IMPLEMENTED);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
index d354761..bc8728d 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryThread.java
@@ -41,19 +41,19 @@
List<PolicyUnit> allPolicyUnits = getPolicyUnitDao().getAll();
List<PolicyUnit> foundInBoth = new LinkedList<PolicyUnit>();
for (ExternalSchedulerDiscoveryUnit unit :
discoveryResult.getFilters()) {
- PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.Filter);
+ PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.FILTER);
if (found != null) {
foundInBoth.add(found);
}
}
for (ExternalSchedulerDiscoveryUnit unit :
discoveryResult.getScores()) {
- PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.Weight);
+ PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.WEIGHT);
if (found != null) {
foundInBoth.add(found);
}
}
for (ExternalSchedulerDiscoveryUnit unit :
discoveryResult.getBalance()) {
- PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.LoadBalancing);
+ PolicyUnit found = compareToDB(allPolicyUnits, unit,
PolicyUnitType.LOAD_BALANCING);
if (found != null) {
foundInBoth.add(found);
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java
index 18e068f..977ac68 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/scheduling/PolicyUnitType.java
@@ -5,9 +5,9 @@
import org.ovirt.engine.core.common.businessentities.Identifiable;
public enum PolicyUnitType implements Identifiable {
- Filter(0),
- Weight(1),
- LoadBalancing(2);
+ FILTER(0),
+ WEIGHT(1),
+ LOAD_BALANCING(2);
private int intValue;
private static final HashMap<Integer, PolicyUnitType> mappings = new
HashMap<Integer, PolicyUnitType>();
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
index 6e70454..fe1b86b 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/ClusterPolicyDaoImpl.java
@@ -86,7 +86,7 @@
}
for (ClusterPolicyUnit clusterPolicyUnit : clusterPolicyUnits) {
ClusterPolicy clusterPolicy =
map.get(clusterPolicyUnit.getClusterPolicyId());
- if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.Filter) {
+ if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.FILTER) {
if (clusterPolicy.getFilters() == null) {
clusterPolicy.setFilters(new ArrayList<Guid>());
}
@@ -99,14 +99,14 @@
clusterPolicyUnit.getFilterSequence());
}
}
- if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.Weight) {
+ if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.WEIGHT) {
if(clusterPolicy.getFunctions() == null){
clusterPolicy.setFunctions(new ArrayList<Pair<Guid,
Integer>>());
}
clusterPolicy.getFunctions().add(new Pair<Guid,
Integer>(clusterPolicyUnit.getPolicyUnitId(),
clusterPolicyUnit.getFactor()));
}
- if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ if
(policyUnitMap.get(clusterPolicyUnit.getPolicyUnitId()).getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
clusterPolicy.setBalance(clusterPolicyUnit.getPolicyUnitId());
}
}
diff --git
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java
index 0d7f271..579a209 100644
---
a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java
+++
b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/scheduling/PolicyUnitDaoImpl.java
@@ -24,7 +24,7 @@
.addValue("name", entity.getName())
.addValue("is_internal", entity.isInternal())
.addValue("type",
- entity.getPolicyUnitType() == null ?
PolicyUnitType.Filter.getValue()
+ entity.getPolicyUnitType() == null ?
PolicyUnitType.FILTER.getValue()
: entity.getPolicyUnitType()
.getValue())
.addValue("description", entity.getDescription())
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java
index f2c6814..21bcc8f 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/PolicyUnitDaoTest.java
@@ -56,7 +56,7 @@
dummyPolicyUnit.setId(Guid.newGuid());
dummyPolicyUnit.setName("Dummy policy unit");
dummyPolicyUnit.setDescription("Description");
- dummyPolicyUnit.setPolicyUnitType(PolicyUnitType.Filter);
+ dummyPolicyUnit.setPolicyUnitType(PolicyUnitType.FILTER);
dummyPolicyUnit.setParameterRegExMap(new LinkedHashMap<String,
String>());
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
index 6b399e9..0cfb1a5 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Linq.java
@@ -1340,12 +1340,12 @@
return !pu1.isEnabled() ? -1 : 1;
}
if (pu1.getPolicyUnitType() != pu2.getPolicyUnitType()) {
- if (pu1.getPolicyUnitType().equals(PolicyUnitType.Filter)
- ||
pu2.getPolicyUnitType().equals(PolicyUnitType.LoadBalancing)) {
+ if (pu1.getPolicyUnitType().equals(PolicyUnitType.FILTER)
+ ||
pu2.getPolicyUnitType().equals(PolicyUnitType.LOAD_BALANCING)) {
return -1;
}
- if (pu2.getPolicyUnitType().equals(PolicyUnitType.Filter)
- ||
pu1.getPolicyUnitType().equals(PolicyUnitType.LoadBalancing)) {
+ if (pu2.getPolicyUnitType().equals(PolicyUnitType.FILTER)
+ ||
pu1.getPolicyUnitType().equals(PolicyUnitType.LOAD_BALANCING)) {
return 1;
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java
index 81e5ff7..0eeac91 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/ClusterPolicyListModel.java
@@ -57,7 +57,7 @@
public List<PolicyUnit> getBalancePolicyUnits() {
ArrayList<PolicyUnit> list = new ArrayList<PolicyUnit>();
for (PolicyUnit policyUnit : getPolicyUnits()) {
- if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
list.add(policyUnit);
}
@@ -68,7 +68,7 @@
public ArrayList<PolicyUnit> getFilterPolicyUnits() {
ArrayList<PolicyUnit> list = new ArrayList<PolicyUnit>();
for (PolicyUnit policyUnit : getPolicyUnits()) {
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Filter) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.FILTER) {
list.add(policyUnit);
}
}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
index aae3274..ae697c8 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/configure/scheduling/NewClusterPolicyModel.java
@@ -185,7 +185,7 @@
}
ArrayList<PolicyUnit> balancePolicyUnits = new ArrayList<PolicyUnit>();
for (PolicyUnit policyUnit : list) {
- if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LoadBalancing) {
+ if (policyUnit.getPolicyUnitType() ==
PolicyUnitType.LOAD_BALANCING) {
balancePolicyUnits.add(policyUnit);
}
}
@@ -198,7 +198,7 @@
}
ArrayList<PolicyUnit> filterPolicyUnits = new ArrayList<PolicyUnit>();
for (PolicyUnit policyUnit : list) {
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Filter) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.FILTER) {
filterPolicyUnits.add(policyUnit);
}
}
@@ -211,7 +211,7 @@
}
ArrayList<PolicyUnit> functionPolicyUnits = new
ArrayList<PolicyUnit>();
for (PolicyUnit policyUnit : list) {
- if (policyUnit.getPolicyUnitType() == PolicyUnitType.Weight) {
+ if (policyUnit.getPolicyUnitType() == PolicyUnitType.WEIGHT) {
functionPolicyUnits.add(policyUnit);
}
}
--
To view, visit http://gerrit.ovirt.org/28092
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I569ac0f9bf60d7496fc24a3532217af4770d2fa7
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
