Daniel Erez has uploaded a new change for review. Change subject: core: LibvirtSecretDaoTest ......................................................................
core: LibvirtSecretDaoTest Added LibvirtSecretDaoTest to test LibvirtSecretDao and modified fixtures.xml accordingly. Change-Id: I3749965e9c0e37b24fc94a0b847a9786ce8a4cf0 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Daniel Erez <de...@redhat.com> --- M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/FixturesTool.java M backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/provider/ProviderDaoTest.java A backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/storage/LibvirtSecretDaoTest.java M backend/manager/modules/dal/src/test/resources/fixtures.xml 4 files changed, 88 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/40/41640/1 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 5d28fbd..57d994d 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 @@ -671,6 +671,10 @@ public static final String EXTERNAL_NETWORK_ID = "52d5c1c6-cb15-4832-b2a4-023770607200"; + public static final Guid CINDER_PROVIDER_ID = new Guid("983fcfe8-ca56-4a11-8d0e-840c988d67af"); + + public static final Guid EXISTING_LIBVIRT_SECRET_ID = new Guid("77569427-9fbe-41db-ae91-fb96fab17141"); + /** * Scheduling Policy */ diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/provider/ProviderDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/provider/ProviderDaoTest.java index 3e75632..f8355e5 100644 --- a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/provider/ProviderDaoTest.java +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/provider/ProviderDaoTest.java @@ -53,7 +53,7 @@ @Override protected int getEneitiesTotalCount() { - return 1; + return 2; } @Test diff --git a/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/storage/LibvirtSecretDaoTest.java b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/storage/LibvirtSecretDaoTest.java new file mode 100644 index 0000000..fdf960e --- /dev/null +++ b/backend/manager/modules/dal/src/test/java/org/ovirt/engine/core/dao/storage/LibvirtSecretDaoTest.java @@ -0,0 +1,51 @@ +package org.ovirt.engine.core.dao.storage; + +import org.ovirt.engine.core.common.businessentities.storage.LibvirtSecret; +import org.ovirt.engine.core.common.businessentities.storage.LibvirtSecretUsageType; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.dao.BaseGenericDaoTestCase; +import org.ovirt.engine.core.dao.FixturesTool; +import org.ovirt.engine.core.dao.LibvirtSecretDao; + +/** + * Unit tests to validate {@link LibvirtSecretDao}. + */ +public class LibvirtSecretDaoTest extends BaseGenericDaoTestCase<Guid, LibvirtSecret, LibvirtSecretDao> { + + private static final int TOTAL_LIBVIRT_SECRETS = 1; + + @Override + protected LibvirtSecret generateNewEntity() { + LibvirtSecret libvirtSecret = new LibvirtSecret(); + libvirtSecret.setId(Guid.newGuid()); + libvirtSecret.setValue("MTIzNDU2Cg=="); + libvirtSecret.setUsageType(LibvirtSecretUsageType.ceph); + libvirtSecret.setProviderId(FixturesTool.CINDER_PROVIDER_ID); + return libvirtSecret; + } + + @Override + protected void updateExistingEntity() { + existingEntity.setDescription("123"); + } + + @Override + protected Guid getExistingEntityId() { + return FixturesTool.EXISTING_LIBVIRT_SECRET_ID; + } + + @Override + protected LibvirtSecretDao prepareDao() { + return dbFacade.getLibvirtSecretDao(); + } + + @Override + protected Guid generateNonExistingId() { + return Guid.newGuid(); + } + + @Override + protected int getEneitiesTotalCount() { + return TOTAL_LIBVIRT_SECRETS; + } +} diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 01a7e38..6fe7145 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -1121,6 +1121,20 @@ <value>{"messagingConfiguration" : {"brokerTpe" : "QPID", "address" : "test", "port" : 5672, "username" : null, "password" : null}, "networkMappings" : ""}</value> <value>http://keystone-server:35357/v2.0/</value> </row> + <row> + <value>983fcfe8-ca56-4a11-8d0e-840c988d67af</value> + <value>cinder provider</value> + <value>OpenStack volume provider</value> + <value>http://provider.com</value> + <value>OPENSTACK_VOLUME</value> + <value>false</value> + <null/> + <null/> + <value>services</value> + <null/> + <null/> + <value>http://keystone-server:5000/v2.0/</value> + </row> </table> <table name="qos"> @@ -8903,4 +8917,22 @@ <value>TEST_FEATURE_2</value> </row> </table> + <table name="libvirt_secrets"> + <column>secret_uuid</column> + <column>secret_value</column> + <column>secret_usage_type</column> + <column>secret_description</column> + <column>provider_id</column> + <column>_create_date</column> + <column>_update_date</column> + <row> + <value>77569427-9fbe-41db-ae91-fb96fab17141</value> + <value>MTIzCg==</value> + <value>0</value> + <null/> + <value>983fcfe8-ca56-4a11-8d0e-840c988d67af</value> + <value>2015-02-10 14:49:55.806609+05:30 </value> + <value>2015-02-10 16:35:15.362494+05:30</value> + </row> + </table> </dataset> -- To view, visit https://gerrit.ovirt.org/41640 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3749965e9c0e37b24fc94a0b847a9786ce8a4cf0 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Daniel Erez <de...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
