Alexander Wels has uploaded a new change for review.
Change subject: engine: Add missing fence option type
......................................................................
engine: Add missing fence option type
- The newly added encrypt_options parameter did not have a type defined
in the database, this caused parsing to fail and in some cases jboss
wouldn't start. This patch fixes the issue and adds a unit test
demonstrating the fix works.
Change-Id: I305de12cdaeac8c018fb5282b3bc0592a1252d20
Signed-off-by: Alexander Wels <aw...@redhat.com>
---
M
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
M packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
2 files changed, 15 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/36/39236/1
diff --git
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
index 64367ec..830929f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
+++
b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/util/FenceOptionsParserTest.java
@@ -11,6 +11,12 @@
import static org.ovirt.engine.api.restapi.util.FenceOptionsParser.parse;
public class FenceOptionsParserTest extends Assert {
+ private static final String FENCE_OPTION =
"apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port,"
+ +
"encrypt_options=encrypt_options;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,"
+ +
"slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,"
+ +
"port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;"
+ + "wti:secure=secure,port=ipport,slot=port";
+ private static final String FENCE_OPTION_TYPES =
"encrypt_options=bool,secure=bool,port=int,slot=int";
@Test
public void testParseEmpty() {
@@ -91,6 +97,14 @@
verifyResult(ret.get(0), "foo");
}
+ @Test
+ public void testParseSecureOptions() {
+ List<PowerManagement> ret = parse(FENCE_OPTION, FENCE_OPTION_TYPES);
+ assertNotNull(ret);
+ assertEquals(16, ret.size());
+ verifyResult(ret.get(1), "apc_snmp", "port", "int", "port",
"encrypt_options", "bool", "encrypt_options");
+ }
+
@Test(expected = IllegalArgumentException.class)
public void testParseMissingType() {
parse("foo:one=1", "two=int");
diff --git a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
index bd99c44..a12af19 100644
--- a/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
+++ b/packaging/dbscripts/upgrade/pre_upgrade/0000_config.sql
@@ -518,7 +518,7 @@
select
fn_db_add_config_value_for_versions_up_to('VdsFenceOptionMapping','apc:secure=secure,port=ipport,slot=port;apc_snmp:port=port,encrypt_options=encrypt_options;bladecenter:secure=secure,port=ipport,slot=port;cisco_ucs:secure=ssl,slot=port;drac5:secure=secure,slot=port;drac7:;eps:slot=port;hpblade:port=port;ilo:secure=ssl,port=ipport;ipmilan:;ilo2:secure=ssl,port=ipport;ilo3:;ilo4:;rsa:secure=secure,port=ipport;rsb:;wti:secure=secure,port=ipport,slot=port','3.6');
select fn_db_add_config_value('CustomVdsFenceOptionMapping','','general');
select fn_db_add_config_value('VdsFenceOptions','','general');
-select
fn_db_add_config_value('VdsFenceOptionTypes','secure=bool,port=int,slot=int','general');
+select
fn_db_add_config_value('VdsFenceOptionTypes','encrypt_options=bool,secure=bool,port=int,slot=int','general');
select
fn_db_add_config_value_for_versions_up_to('VdsFenceType','alom,apc,bladecenter,drac5,eps,ilo,ilo3,ipmilan,rsa,rsb,wti,cisco_ucs','3.1');
select
fn_db_add_config_value_for_versions_up_to('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,eps,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.3');
select
fn_db_add_config_value_for_versions_up_to('VdsFenceType','apc,apc_snmp,bladecenter,cisco_ucs,drac5,drac7,eps,hpblade,ilo,ilo2,ilo3,ilo4,ipmilan,rsa,rsb,wti','3.6');
--
To view, visit https://gerrit.ovirt.org/39236
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I305de12cdaeac8c018fb5282b3bc0592a1252d20
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
