Mike Kolesnik has uploaded a new change for review. Change subject: engine: Added provided by field to network ......................................................................
engine: Added provided by field to network Added field to Network entity which allows to specify the provider for this network. Change-Id: I2051a607f8ab7e7c2915aa4625720376434cd126 Signed-off-by: Mike Kolesnik <[email protected]> --- A backend/manager/dbscripts/upgrade/03_03_0020_add_provided_by_to_network.sql M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml 3 files changed, 22 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/86/10786/1 diff --git a/backend/manager/dbscripts/upgrade/03_03_0020_add_provided_by_to_network.sql b/backend/manager/dbscripts/upgrade/03_03_0020_add_provided_by_to_network.sql new file mode 100644 index 0000000..26d31ac --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_03_0020_add_provided_by_to_network.sql @@ -0,0 +1,2 @@ +ALTER TABLE network ADD COLUMN provided_by UUID CONSTRAINT fk_network_provided_by REFERENCES network_providers(id); + diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java index eb29954..e273f7b 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/network/NetworkDaoTest.java @@ -88,7 +88,7 @@ List<Network> result = dao.getAll(); assertNotNull(result); - assertEquals(3, result.size()); + assertEquals(4, result.size()); } /** diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index d5e6b22..ba7a8e2 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -661,6 +661,7 @@ <column>storage_pool_id</column> <column>mtu</column> <column>vm_network</column> + <column>provided_by</column> <row> <value>58d5c1c6-cb15-4832-b2a4-023770607188</value> <value>engine</value> @@ -674,6 +675,7 @@ <value>6d849ebf-755f-4552-ad09-9a090cda105d</value> <value>0</value> <value>true</value> + <null /> </row> <row> <value>58d5c1c6-cb15-4832-b2a4-023770607189</value> @@ -688,6 +690,7 @@ <value>6d849ebf-755f-4552-ad09-9a090cda105d</value> <value>0</value> <value>true</value> + <null /> </row> <row> <value>58d5c1c6-cb15-4832-b2a4-023770607190</value> @@ -702,6 +705,22 @@ <value>6d849ebf-755f-4552-ad09-9a090cda105d</value> <value>0</value> <value>true</value> + <null /> + </row> + <row> + <value>58d5c1c6-cb15-4832-b2a4-023770607200</value> + <value>external</value> + <value>Some external network</value> + <null /> + <null /> + <null /> + <null /> + <null /> + <value>0</value> + <value>6d849ebf-755f-4552-ad09-9a090cda105d</value> + <value>0</value> + <value>true</value> + <value>1115c1c6-cb15-4832-b2a4-023770607111</value> </row> </table> -- To view, visit http://gerrit.ovirt.org/10786 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2051a607f8ab7e7c2915aa4625720376434cd126 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Mike Kolesnik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
