backend/server/rhnVirtualization.py |
2 +-
java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml |
2 +-
java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java |
10 +++++-----
java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java |
6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 50eea0912d7d1fefe970968d5885f8982ff3502d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Sep 30 14:16:49 2011 +0200
738999 - VirtualInstance.confirmed is number not boolean
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
index 2755718..03f1b98 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.hbm.xml
@@ -15,7 +15,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
</id>
<property name="uuid" column="UUID"
type="string" length="128"/>
- <property name="confirmed" column="CONFIRMED"
type="boolean"/>
+ <property name="confirmed" column="CONFIRMED"
type="long"/>
<property name="created" column="CREATED"
type="timestamp" insert="false" update="false"/>
<property name="modified" column="MODIFIED"
type="timestamp" insert="false" update="false"/>
diff --git a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
index eca4921..32441e9 100644
--- a/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
+++ b/java/code/src/com/redhat/rhn/domain/server/VirtualInstance.java
@@ -40,7 +40,7 @@ public class VirtualInstance extends BaseDomainHelper {
private Server guest;
private Server host;
private String uuid;
- private boolean confirmed;
+ private Long confirmed;
private VirtualInstanceInfo info;
/**
@@ -88,17 +88,17 @@ public class VirtualInstance extends BaseDomainHelper {
/**
*
- * @return true or false
+ * @return confirmed
*/
- public boolean isConfirmed() {
+ public Long getConfirmed() {
return confirmed;
}
/**
*
- * @param isConfirmed true or false
+ * @param isConfirmed long
*/
- public void setConfirmed(boolean isConfirmed) {
+ public void setConfirmed(Long isConfirmed) {
confirmed = isConfirmed;
}
diff --git
a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
index c99296c..3ed6836 100644
---
a/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
+++
b/java/code/src/com/redhat/rhn/domain/server/test/ServerFactoryVirtualizationTest.java
@@ -180,7 +180,7 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase
{
Server retrievedGuest = ServerFactory.lookupById(guest.getId());
retrievedGuest.setName("the_guest");
- retrievedGuest.getVirtualInstance().setConfirmed(true);
+ retrievedGuest.getVirtualInstance().setConfirmed(1);
ServerFactory.save(retrievedGuest);
flushAndEvict(retrievedGuest);
@@ -188,8 +188,8 @@ public class ServerFactoryVirtualizationTest extends RhnBaseTestCase
{
Server updatedGuest = ServerFactory.lookupById(guest.getId());
assertEquals(updatedGuest.getName(), retrievedGuest.getName());
- assertEquals(updatedGuest.getVirtualInstance().isConfirmed(),
- retrievedGuest.getVirtualInstance().isConfirmed());
+ assertEquals(updatedGuest.getVirtualInstance().getConfirmed(),
+ retrievedGuest.getVirtualInstance().getConfirmed());
}
}
commit 36208823bf8ecda8f4bc1376be4e8e69f4e0f2a6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Nov 11 14:55:55 2011 +0100
738999 - aliases in update don't work
fixing
[Fri Nov 11 08:38:15 2011] [error] SQL Error generated: ('column "rvii"
of relation "rhn
virtualinstanceinfo" does not exist\\nLINE 3: SET rvii.state=(\\n
^\\n', 0, '\\n UPDATE rhnVirtualInstanceInfo rvii\\n
SET rvii.state=(\\n SELECT rvis.id \\n FROM
rhnVirtualInst
anceState rvis\\n WHERE rvis.label=%(state)s\\n )\\n
WHERE\\n rvii.instance_id IN (\\n SELECT
rvi.id\\n
FROM rhnVirtualInstance rvi\\n WHERE
rvi.confirmed=
0)\\n ')
diff --git a/backend/server/rhnVirtualization.py b/backend/server/rhnVirtualization.py
index 0383589..974a2f2 100644
--- a/backend/server/rhnVirtualization.py
+++ b/backend/server/rhnVirtualization.py
@@ -692,7 +692,7 @@ class VirtualizationEventHandler:
update_sql = """
UPDATE rhnVirtualInstanceInfo rvii
- SET rvii.state=(
+ SET state=(
SELECT rvis.id
FROM rhnVirtualInstanceState rvis
WHERE rvis.label=:state
Show replies by date