Alissa Bonas has uploaded a new change for review.
Change subject: restapi: solve VCpuPin CNF exception in tests
......................................................................
restapi: solve VCpuPin CNF exception in tests
Solve ClassNotFound exception in mapper tests related
to incorrect naming and lookup of VCpuPin class.
It also improves *MapperTest(s) runtime.
For example - VmMapperTest runs 12 seconds faster.
Change-Id: I9dfefff32fc764e09496bb742649fbba598022ac
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
M
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
3 files changed, 18 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/18750/1
diff --git
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
index f5198a6..41df119 100644
---
a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
+++
b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
@@ -432,7 +432,12 @@
<xs:complexType name="CpuTune">
<xs:sequence>
- <xs:element name="vcpu_pin" type="VCpuPin" minOccurs="0"
maxOccurs="unbounded"/>
+ <xs:annotation>
+ <xs:appinfo>
+ <jaxb:property name="VCpuPin"/>
+ </xs:appinfo>
+ </xs:annotation>
+ <xs:element ref="vcpu_pin" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
</xs:complexType>
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
index e234942..6416210 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
@@ -885,7 +885,7 @@
static String cpuTuneToString(final CpuTune tune) {
final StringBuilder builder = new StringBuilder();
boolean first = true;
- for(final VCpuPin pin : tune.getVcpuPin()) {
+ for(final VCpuPin pin : tune.getVCpuPin()) {
if(first) {
first = false;
} else {
@@ -908,7 +908,7 @@
final CpuTune cpuTune = new CpuTune();
for(String strCpu : cpuPinning.split("_")) {
VCpuPin pin = stringToVCpupin(strCpu);
- cpuTune.getVcpuPin().add(pin);
+ cpuTune.getVCpuPin().add(pin);
}
return cpuTune;
diff --git
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
index 4d2fc88..deaf54b 100644
---
a/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
+++
b/backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/types/VmMapperTest.java
@@ -71,6 +71,12 @@
while (from.getCpu().getTopology().getCores() == 0) {
from.getCpu().getTopology().setCores(MappingTestHelper.rand(100));
}
+ CpuTune cpuTune = new CpuTune();
+ VCpuPin pin = new VCpuPin();
+ pin.setVcpu(33);
+ pin.setCpuSet("1-4,6");
+ cpuTune.getVCpuPin().add(pin);
+ from.getCpu().setCpuTune(cpuTune);
from.setTimezone("Australia/Darwin");
return from;
}
@@ -226,10 +232,10 @@
public void stringToCpuTune() {
CpuTune cpuTune = VmMapper.stringToCpuTune("0#0");
assertNotNull(cpuTune);
- assertNotNull(cpuTune.getVcpuPin());
- assertEquals(1, cpuTune.getVcpuPin().size());
- assertEquals(0, cpuTune.getVcpuPin().get(0).getVcpu());
- assertEquals("0", cpuTune.getVcpuPin().get(0).getCpuSet());
+ assertNotNull(cpuTune.getVCpuPin());
+ assertEquals(1, cpuTune.getVCpuPin().size());
+ assertEquals(0, cpuTune.getVCpuPin().get(0).getVcpu());
+ assertEquals("0", cpuTune.getVCpuPin().get(0).getCpuSet());
}
@Test(expected = IllegalArgumentException.class)
--
To view, visit http://gerrit.ovirt.org/18750
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dfefff32fc764e09496bb742649fbba598022ac
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
