Yair Zaslavsky has posted comments on this change.
Change subject: Adding bios information to vds object
......................................................................
Patch Set 12: I would prefer that you didn't submit this
(5 inline comments)
Pay attention to fixtures.xml
Please run mvn clean install -P enable-dao-tests on dal module, especially when
you are changing entities or any other db-related issue,
Thanks
....................................................
File
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
Line 304:
Line 305: private boolean registerNewHost(Guid vdsGroupId, boolean
IsPending) {
Line 306: boolean returnValue = true;
Line 307: // management ip is not currently passed by registration
Line 308: VdsStatic vds = new
VdsStatic(getParameters().getVdsHostName(), "",
I prefer that besides existing CTORs you also add a new CTOR, which does not
have host bios info in params, and fills these fields with empty strings.
Line 309: getStrippedVdsUniqueId(),
getParameters().getPort(), vdsGroupId, Guid.Empty,
Line 310: getParameters().getVdsName(), Config.<Boolean>
GetValue(ConfigValues.SSLEnabled),
Line 311: getParameters().getVdsType(), "", "", "", "", "",
"");
Line 312:
....................................................
File
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/gluster/ReplaceGlusterVolumeBrickCommandTest.java
Line 120: serverId,
Line 121: serverName,
Line 122: true,
Line 123: VDSType.oVirtNode,
Line 124: "", "", "", "", "", ""),
This is just an example to the fact that if you had additional CTOR, you
wouldn't need to change lots of places which do not have anything to do with
host bios info.
Line 125: "/tmp/" + dirPrefix + i.toString(),
Line 126: GlusterStatus.UP);
Line 127: bricks.add(brick);
Line 128: }
....................................................
File
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
Line 156: return false;
Line 157: return true;
Line 158: }
Line 159:
Line 160: public VDS(Guid vds_group_id, String vds_group_name, String
vds_group_description, Guid vds_id, String vds_name,
Don't forget to add the new CTOR both at vds and VdsStatic
Line 161: String ip, String host_name, int port, int status, String
biosManufacturer, String biosProductName,
Line 162: String biosVersion, String biosSerialNumber, String
biosUUID, String biosFamily,
Line 163: Integer cpu_cores, String cpu_model,
Line 164: Double cpu_speed_mh, String if_total_speed, Boolean
kvm_enabled, Integer physical_mem_mb,
....................................................
File backend/manager/modules/dal/src/test/resources/fixtures.xml
Line 786: <value>0</value>
Line 787: <value>2010-11-17 17:25:39</value>
Line 788: <value>2010-12-01 09:52:57</value>
Line 789: <value>8</value>
Line 790:
<value>b5:ad:16:19:06:9f:b3:41:69:eb:1c:42:1d:12:b5:31</value>
I have a feeling you have inconsistent number in the entries per each row - pay
attention - each column defines the column in the table, so u have a matching
number of elements in each row.
Line 791: </row>
Line 792: <row>
Line 793: <value>afce7a39-8e8c-4819-ba9c-796d316592e7</value>
Line 794: <value>purple-vdsc</value>
....................................................
File
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
Line 526: if (vdsBrokerCommand.getVDSReturnValue().getSucceeded()) {
Line 527: // Verify if version is upper then 3.2 for bios
capabilities
Line 528: if
(vds.getSupportedClusterVersionsSet().contains(Version.v3_2)){
Line 529: GetBiosInfoVDSCommand vdsBiosCommand = new
GetBiosInfoVDSCommand(
Line 530: new VdsIdAndVdsVDSCommandParametersBase(vds));
Is this the only place you should active the VDS command from?
Line 531: vdsBiosCommand.Execute();
Line 532: if
(!vdsBrokerCommand.getVDSReturnValue().getSucceeded()) {
Line 533: setIsSetNonOperationalExecuted(true);
Line 534: }
--
To view, visit http://gerrit.ovirt.org/9337
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I142198d2059cf109be3859f255621e6ceca8582b
Gerrit-PatchSet: 12
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <[email protected]>
Gerrit-Reviewer: Allon Mureinik <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Alona Kaplan <[email protected]>
Gerrit-Reviewer: Barak Azulay <[email protected]>
Gerrit-Reviewer: Eli Mesika <[email protected]>
Gerrit-Reviewer: Michael Kublin <[email protected]>
Gerrit-Reviewer: Michael Pasternak <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Oved Ourfali <[email protected]>
Gerrit-Reviewer: Yair Zaslavsky <[email protected]>
Gerrit-Reviewer: Yaniv Bronhaim <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
