ofri masad has posted comments on this change.
Change subject: core: Add QoS to to DB and entities
......................................................................
Patch Set 10: (19 inline comments)
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/qos/RemoveNetworkQoSCommand.java
Line 17: if (validateParameters()) {
Line 18: NetworkQoS oldNetworkQoS =
getNetworkQoSDao().get(getNetworkQoS().getId());
Line 19: if (oldNetworkQoS == null) {
Line 20: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_NOT_FOUND);
Line 21: } else if
(!oldNetworkQoS.getStoragePoolId().equals(getNetworkQoS().getStoragePoolId())) {
Done
Line 22: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_INVALID_DC_ID);
Line 23: }
Line 24: }
Line 25: return true;
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/qos/UpdateNetworkQoSCommand.java
Line 17: if (validateParameters()) {
Line 18: NetworkQoS oldNetworkQoS =
getNetworkQoSDao().get(getNetworkQoS().getId());
Line 19: if (oldNetworkQoS == null) {
Line 20: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_NOT_FOUND);
Line 21: } else if
(!oldNetworkQoS.getStoragePoolId().equals(getNetworkQoS().getStoragePoolId())) {
Done
Line 22: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_INVALID_DC_ID);
Line 23: } else {
Line 24: if (validateValues() &&
!oldNetworkQoS.getName().equals(getNetworkQoS().getName())) {
Line 25: return validateNameNotExistInDC();
Line 20: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_NOT_FOUND);
Line 21: } else if
(!oldNetworkQoS.getStoragePoolId().equals(getNetworkQoS().getStoragePoolId())) {
Line 22: return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_NETWORK_QOS_INVALID_DC_ID);
Line 23: } else {
Line 24: if (validateValues() &&
!oldNetworkQoS.getName().equals(getNetworkQoS().getName())) {
Done
Line 25: return validateNameNotExistInDC();
Line 26: }
Line 27: }
Line 28: }
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/AuditLogType.java
Line 749: //watchdog
Line 750: WATCHDOG_EVENT(9901),
Line 751:
Line 752: //network Qos
Line 753: USER_ADDED_NETWORK_QOS(9920),
Done
Line 754: USER_FAILED_TO_ADD_NETWORK_QOS(9921),
Line 755: USER_REMOVED_NETWORK_QOS(9922),
Line 756: USER_FAILED_TO_REMOVE_NETWORK_QOS(9923),
Line 757: USER_UPDATED_NETWORK_QOS(9924),
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java
Line 1450:
Line 1451: @TypeConverterAttribute(Double.class)
Line 1452: @DefaultValueAttribute("0.2")
Line 1453: AverageToBurstRatio(521),
Line 1454:
They are used in the dependent UI patch. since i use the first three in this
patch, i added them all here.
Line 1455: Invalid(65535);
Line 1456:
Line 1457: private int intValue;
Line 1458: private static Map<Integer, ConfigValues> mappings;
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/VdcQueryType.java
Line 256: GetAllProviders,
Line 257: GetAllNetworksForProvider,
Line 258:
Line 259: //Network QoS
Line 260: GetAllNetworkQosByStoragePoolId,
no. the QoS is not exposed to user
Line 261:
Line 262: GetWatchdog(VdcQueryAuthType.User),
Line 263: GetConsoleDevices(VdcQueryAuthType.User),
Line 264:
....................................................
File
backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/network/NetworkQoSDaoImpl.java
Line 9: import java.sql.ResultSet;
Line 10: import java.sql.SQLException;
Line 11: import java.util.List;
Line 12:
Line 13: public class NetworkQoSDaoImpl extends
DefaultGenericDaoDbFacade<NetworkQoS, Guid> implements NetworkQoSDao {
Done
Line 14:
Line 15: protected final RowMapper<NetworkQoS> mapper =
createEntityRowMapper();
Line 16:
Line 17: /**
Line 49: return string == null ? null : Integer.parseInt(string);
Line 50: }
Line 51:
Line 52: @Override
Line 53: public NetworkQoS get(Guid id) {
Done
Line 54: MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource().addValue("id", id.getUuid());
Line 55: return getCallsHandler().executeRead("Get_network_qos_by_id",
mapper, parameterSource);
Line 56: }
Line 57:
Line 55: return getCallsHandler().executeRead("Get_network_qos_by_id",
mapper, parameterSource);
Line 56: }
Line 57:
Line 58: @Override
Line 59: public void save(NetworkQoS networkQoS) {
Done
Line 60: MapSqlParameterSource parameterSource =
getCustomMapSqlParameterSource()
Line 61: .addValue("id", networkQoS.getId())
Line 62: .addValue("name", networkQoS.getName())
Line 63: .addValue("storage_pool_id",
networkQoS.getStoragePoolId())
Line 71: getCallsHandler().executeModification("Insert_network_qos",
parameterSource);
Line 72: }
Line 73:
Line 74: @Override
Line 75: public void update(NetworkQoS networkQoS) {
Done
Line 76: getCallsHandler().executeModification("Update_network_qos",
createFullParametersMapper(networkQoS));
Line 77: }
Line 78:
Line 79: @Override
Line 76: getCallsHandler().executeModification("Update_network_qos",
createFullParametersMapper(networkQoS));
Line 77: }
Line 78:
Line 79: @Override
Line 80: public void remove(Guid id) {
Done
Line 81: getCallsHandler().executeModification("Delete_network_qos",
createIdParameterMapper(id));
Line 82: }
Line 83:
Line 84: @Override
Line 81: getCallsHandler().executeModification("Delete_network_qos",
createIdParameterMapper(id));
Line 82: }
Line 83:
Line 84: @Override
Line 85: public List<NetworkQoS> getAll() {
Done
Line 86: return
getCallsHandler().executeReadList("Get_all_network_qos", mapper,
getCustomMapSqlParameterSource());
Line 87: }
Line 88:
Line 89: @Override
....................................................
File backend/manager/modules/dal/src/main/jdbc-resources/engine-daos.properties
Line 62:
GlusterServiceDao=org.ovirt.engine.core.dao.gluster.GlusterServiceDaoDbFacadeImpl
Line 63:
GlusterServerServiceDao=org.ovirt.engine.core.dao.gluster.GlusterServerServiceDaoDbFacadeImpl
Line 64:
GlusterClusterServiceDao=org.ovirt.engine.core.dao.gluster.GlusterClusterServiceDaoDbFacadeImpl
Line 65:
GlusterServerDao=org.ovirt.engine.core.dao.gluster.GlusterServerDaoDbFacadeImpl
Line 66: NetworkQoSDao=org.ovirt.engine.core.dao.network.NetworkQoSDaoImpl
Done
....................................................
File backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
Line 236: VAR__TYPE__USER_FROM_VM=$type User to VM
Line 237: VAR__TYPE__USER=$type User
Line 238: VAR__TYPE__PERMISSION=$type Permission
Line 239: VAR__TYPE__HOST_CAPABILITIES=$type Host capabilities
Line 240: VAR__TYPE__NETWORK_QOS=$type Network QoS
No. QoS. this is how it always presented on all systems
Line 241: VAR__ACTION__RUN=$action run
Line 242: VAR__ACTION__REMOVE=$action remove
Line 243: VAR__ACTION__ADD=$action add
Line 244: VAR__ACTION__CREATE=$action create
....................................................
File packaging/dbscripts/network_qos_sp.sql
Line 14: RETURNS VOID
Line 15: AS $procedure$
Line 16: BEGIN
Line 17: INSERT INTO network_qos(id, name, storage_pool_id, inbound_average,
inbound_peak, inbound_burst, outbound_average, outbound_peak, outbound_burst)
Line 18: VALUES(v_id, v_name, v_storage_pool_id, v_inbound_average,
v_inbound_peak, v_inbound_burst, v_outbound_average, v_outbound_peak,
v_outbound_burst);
Done
Line 19: END; $procedure$
Line 20: LANGUAGE plpgsql;
Line 21:
Line 22:
Line 19: END; $procedure$
Line 20: LANGUAGE plpgsql;
Line 21:
Line 22:
Line 23: Create or replace FUNCTION update_network_qos(v_id uuid,
Done
Line 24: v_name VARCHAR(50),
Line 25: v_storage_pool_id uuid,
Line 26: v_inbound_average INTEGER,
Line 27: v_inbound_peak INTEGER,
....................................................
File packaging/dbscripts/upgrade/03_03_0460_add_network_qos_tabel.sql
Line 1: --
----------------------------------------------------------------------
Line 2: -- table network_qos
Done
Line 3: --
----------------------------------------------------------------------
Line 4:
Line 5: CREATE TABLE network_qos
Line 6: (
Line 18: CONSTRAINT PK_network_qos_id PRIMARY KEY (id)
Line 19: ) WITH OIDS;
Line 20:
Line 21: ALTER TABLE network_qos ADD CONSTRAINT network_qos_storage_pool_fk
Line 22: FOREIGN KEY(storage_pool_id) REFERENCES storage_pool(id) ON DELETE
CASCADE;
Done
....................................................
File packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
Line 582:
Line 583: select
fn_db_add_config_value('MaxAverageNetworkQoSValue','1024','general');
Line 584: select
fn_db_add_config_value('MaxPeakNetworkQoSValue','2048','general');
Line 585: select
fn_db_add_config_value('MaxBurstNetworkQoSValue','10240','general');
Line 586:
Done
Line 587:
------------------------------------------------------------------------------------
Line 588: -- Update with override section
Line 589:
------------------------------------------------------------------------------------
Line 590:
--
To view, visit http://gerrit.ovirt.org/16294
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: If39d20b77d06165e4adcc27e6b6dc5458cac93d3
Gerrit-PatchSet: 10
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: ofri masad <[email protected]>
Gerrit-Reviewer: Doron Fediuck <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Gilad Chaplik <[email protected]>
Gerrit-Reviewer: Moti Asayag <[email protected]>
Gerrit-Reviewer: Oved Ourfali <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-Reviewer: ofri masad <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
