Yair Zaslavsky has uploaded a new change for review.
Change subject: core: Reintroducing foreign keys to async_tasks table
......................................................................
core: Reintroducing foreign keys to async_tasks table
This introduces back async tasks foreign keys that were removed at commit
2ffabb2eca77eb58657265f68c80f69beb486e9d
Change-Id: Ic2306abce7940f5c8a581ef4f71ddfcb1f6849df
Signed-off-by: Yair Zaslavsky <yzasl...@redhat.com>
---
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
M
backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
M backend/manager/modules/dal/src/test/resources/fixtures.xml
3 files changed, 16 insertions(+), 5 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/35399/1
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
index b50c70f..0105f75 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/AsyncTaskDAOTest.java
@@ -62,8 +62,8 @@
newAsyncTask.setresult(AsyncTaskResultEnum.success);
newAsyncTask.setActionParameters(params);
newAsyncTask.setTaskParameters(taskParams);
- newAsyncTask.setCommandId(Guid.newGuid());
- newAsyncTask.setRootCommandId(Guid.newGuid());
+ newAsyncTask.setCommandId(FixturesTool.COMMAND_ID);
+ newAsyncTask.setRootCommandId(FixturesTool.ROOT_COMMAND_ID);
newAsyncTask.setTaskType(AsyncTaskType.copyImage);
newAsyncTask.setStoragePoolId(Guid.newGuid());
diff --git
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
index 0e0cc66..3c4019e 100644
---
a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
+++
b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java
@@ -665,4 +665,7 @@
public static final Guid CPU_PROFILE_1 = new
Guid("fd81f1e1-785b-4579-ab75-1419ebb87052");
public static final Guid CPU_PROFILE_2 = new
Guid("fd81f1e1-785b-4579-ab75-1419ebb87053");
+
+ public static final Guid COMMAND_ID = new
Guid("340fd52b-3400-4cdd-8d3f-c9d03704b0a1");
+ public static final Guid ROOT_COMMAND_ID = new
Guid("440fd52b-3400-4cdd-8d3f-c9d03704b0aa");
}
diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml
b/backend/manager/modules/dal/src/test/resources/fixtures.xml
index eb0ded5..6dfd07b 100644
--- a/backend/manager/modules/dal/src/test/resources/fixtures.xml
+++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml
@@ -121,6 +121,14 @@
<column>command_parameters</column>
<column>status</column>
<row>
+ <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value>
+ <value>230</value>
+ <null/>
+ <value>2010-11-29 15:57:10</value>
+ <null/>
+ <value>ACTIVE</value>
+ </row>
+ <row>
<value>340fd52b-3400-4cdd-8d3f-c9d03704b0a1</value>
<value>230</value>
<null/>
@@ -145,7 +153,7 @@
<value>ACTIVE</value>
</row>
<row>
- <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value>
+ <value>340fd52b-3400-4cdd-8d3f-c9d03704b0aa</value>
<value>1</value>
<null/>
<value>2010-11-29 15:57:10</value>
@@ -153,7 +161,7 @@
<value>ACTIVE</value>
</row>
<row>
- <value>440fd52b-3400-4cdd-8d3f-c9d03704b0ab</value>
+ <value>340fd52b-3400-4cdd-8d3f-c9d03704b0ab</value>
<value>1</value>
<null/>
<value>2010-11-29 15:57:10</value>
@@ -191,7 +199,7 @@
<value>2</value> <!-- Running -->
<value>0</value> <!-- Success -->
<value>340fd52b-3400-4cdd-8d3f-c9d03704b0ab</value>
- <value>440fd52b-3400-4cdd-8d3f-c9d03704b0ab</value>
+ <value>440fd52b-3400-4cdd-8d3f-c9d03704b0aa</value>
<value>2010-12-01 14:13:07</value>
<value>6d849ebf-755f-4552-ad09-9a090cda105d</value>
<value>3</value>
--
To view, visit http://gerrit.ovirt.org/35399
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic2306abce7940f5c8a581ef4f71ddfcb1f6849df
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yair Zaslavsky <yzasl...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
