hostsharing/hs.hsadmin
8
1
Fork 0
Code Pull Requests Activity

remove legacy code pac dw/sw

Browse Source
This commit is contained in:
Peter Hormanns 2017-10-04 16:50:33 +02:00
parent b34d706e36
commit 9dd25448d8
15 changed files with 14 additions and 312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hsarback/src/de/hsadmin/hostsharing/BasePacType.java
View File

@ -2,8 +2,6 @@ package de.hsadmin.hostsharing;
public class BasePacType { public class BasePacType {
public static final String PAC_DW = "PAC/DW";
public static final String PAC_SW = "PAC/SW";
public static final String PAC_WEB = "PAC/WEB"; public static final String PAC_WEB = "PAC/WEB";
public static final String PAC_SRV = "SRV/MGD"; public static final String PAC_SRV = "SRV/MGD";

2
hsarback/src/de/hsadmin/mods/db/MySqlDatabaseModuleImpl.java
View File

@ -58,7 +58,7 @@ public class MySqlDatabaseModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

2
hsarback/src/de/hsadmin/mods/db/MySqlUserModuleImpl.java
View File

@ -39,7 +39,7 @@ public class MySqlUserModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

2
hsarback/src/de/hsadmin/mods/db/PgSqlDatabaseModuleImpl.java
View File

@ -57,7 +57,7 @@ public class PgSqlDatabaseModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

2
hsarback/src/de/hsadmin/mods/db/PgSqlUserModuleImpl.java
View File

@ -34,7 +34,7 @@ public class PgSqlUserModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

2
hsarback/src/de/hsadmin/mods/dom/DomainModuleImpl.java
View File

@ -127,7 +127,7 @@ public class DomainModuleImpl extends AbstractModuleImpl {
//TODO: Needs better implementation //TODO: Needs better implementation
final Pac pac = admin.getPac(); final Pac pac = admin.getPac();
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW) && !pacType.equals(BasePacType.PAC_SW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
final String hiveName = pac.getHive().getHiveName(); final String hiveName = pac.getHive().getHiveName();

2
hsarback/src/de/hsadmin/mods/email/EMailAddressModuleImpl.java
View File

@ -57,7 +57,7 @@ public class EMailAddressModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = dom.getUser().getPac().getBasepac().getName(); String pacType = dom.getUser().getPac().getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW) && !pacType.equals(BasePacType.PAC_SW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

2
hsarback/src/de/hsadmin/mods/email/EMailAliasModuleImpl.java
View File

@ -48,7 +48,7 @@ public class EMailAliasModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW) && !pacType.equals(BasePacType.PAC_SW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

4
hsarback/src/de/hsadmin/mods/pac/PacModuleImpl.java
View File

@ -95,7 +95,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
pac.setPacComponents(pacComponents); pac.setPacComponents(pacComponents);
AbstractEntity newPacEntity = null; AbstractEntity newPacEntity = null;
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (pacType.equals(BasePacType.PAC_WEB) || pacType.equals(BasePacType.PAC_DW) || pacType.equals(BasePacType.PAC_SW)) { if (pacType.equals(BasePacType.PAC_WEB)) {
Set<UnixUser> users = new HashSet<UnixUser>(); Set<UnixUser> users = new HashSet<UnixUser>();
pac.setUnixUser(users); pac.setUnixUser(users);
UnixUser admin = new UnixUser(); UnixUser admin = new UnixUser();
@ -201,7 +201,7 @@ public class PacModuleImpl extends AbstractModuleImpl {
throw new AuthorisationException(getTransaction().getLoginUser(), "delete", existingEntity); throw new AuthorisationException(getTransaction().getLoginUser(), "delete", existingEntity);
} }
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (pacType.equals(BasePacType.PAC_WEB) || pacType.equals(BasePacType.PAC_DW) || pacType.equals(BasePacType.PAC_SW)) { if (pacType.equals(BasePacType.PAC_WEB)) {
GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction()); GenericModuleImpl helperModule = new GenericModuleImpl(getTransaction());
String[] dependQueries = new String[] { String[] dependQueries = new String[] {

6
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
View File

@ -27,7 +27,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
EntityManager em, T entity) throws ProcessorException { EntityManager em, T entity) throws ProcessorException {
Pac pac = (Pac) entity; Pac pac = (Pac) entity;
String basepacName = pac.getBasepac().getName(); String basepacName = pac.getBasepac().getName();
if (basepacName.equals(BasePacType.PAC_WEB) || basepacName.equals(BasePacType.PAC_DW) || basepacName.equals(BasePacType.PAC_SW)) { if (basepacName.equals(BasePacType.PAC_WEB)) {
String pacName = pac.getName(); String pacName = pac.getName();
Hive hive = pac.getHive(); Hive hive = pac.getHive();
UnixUser unixUser = getPacAdminUser(pac); UnixUser unixUser = getPacAdminUser(pac);
@ -54,7 +54,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
throws ProcessorException { throws ProcessorException {
Pac pac = (Pac) entity; Pac pac = (Pac) entity;
String basepacName = pac.getBasepac().getName(); String basepacName = pac.getBasepac().getName();
if (basepacName.equals(BasePacType.PAC_WEB) || basepacName.equals(BasePacType.PAC_DW) || basepacName.equals(BasePacType.PAC_SW)) { if (basepacName.equals(BasePacType.PAC_WEB)) {
return createSetQuotaProc(pac); return createSetQuotaProc(pac);
} else { } else {
return new NullProcessor(); return new NullProcessor();
@ -65,7 +65,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
public <T extends AbstractEntity> Processor createDeleteProcessor(EntityManager em, T entity) throws ProcessorException { public <T extends AbstractEntity> Processor createDeleteProcessor(EntityManager em, T entity) throws ProcessorException {
Pac pac = (Pac) entity; Pac pac = (Pac) entity;
String basepacName = pac.getBasepac().getName(); String basepacName = pac.getBasepac().getName();
if (basepacName.equals(BasePacType.PAC_WEB) || basepacName.equals(BasePacType.PAC_DW) || basepacName.equals(BasePacType.PAC_SW)) { if (basepacName.equals(BasePacType.PAC_WEB)) {
Hive hive = pac.getHive(); Hive hive = pac.getHive();
hive.getPacs().remove(pac); hive.getPacs().remove(pac);
WaitingTasksProcessor waiting = new WaitingTasksProcessor(createDelUserProc(pac.getName())); WaitingTasksProcessor waiting = new WaitingTasksProcessor(createDelUserProc(pac.getName()));

2
hsarback/src/de/hsadmin/mods/user/UnixUserModuleImpl.java
View File

@ -129,7 +129,7 @@ public class UnixUserModuleImpl extends AbstractModuleImpl {
} }
//TODO: Needs better implementation //TODO: Needs better implementation
String pacType = pac.getBasepac().getName(); String pacType = pac.getBasepac().getName();
if (!pacType.equals(BasePacType.PAC_WEB) && !pacType.equals(BasePacType.PAC_DW) && !pacType.equals(BasePacType.PAC_SW)) { if (!pacType.equals(BasePacType.PAC_WEB)) {
throw new HSAdminException("not allowed for this packet type"); throw new HSAdminException("not allowed for this packet type");
} }
//TODO: Needs better implementation //TODO: Needs better implementation

1
hsarback/test/de/hsadmin/remote/ContinuousIntegrationTest.java
View File

@ -19,7 +19,6 @@ import org.junit.runners.Suite;
EMailAddressTest.class, EMailAddressTest.class,
SSLCertDomainTest.class, SSLCertDomainTest.class,
DatabaseCleanTest.class, DatabaseCleanTest.class,
PacMigrationTest.class,
CustomerTest.class CustomerTest.class
// LongCustomerNameTest.class, // LongCustomerNameTest.class,
// QueueTaskTest.class // QueueTaskTest.class

294
hsarback/test/de/hsadmin/remote/PacMigrationTest.java
View File

@ -1,294 +0,0 @@
package de.hsadmin.remote;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import org.apache.xmlrpc.XmlRpcException;
import org.apache.xmlrpc.client.XmlRpcClient;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import de.hsadmin.core.util.Config;
import de.hsadmin.core.util.TextUtil;
import de.hsadmin.hostsharing.BasePacType;
public class PacMigrationTest {
private static final String MODULE = "pac";
private XmlRpcClient client;
private RemoteCASHelper cas;
private Config config;
@Before
public void setUp() throws Exception {
client = RemoteTestHelper.getClient();
cas = new RemoteCASHelper();
config = Config.getInstance();
}
@After
public void tearDown() throws Exception {
client = null;
cas = null;
}
@Test
public void testSW() {
testCreateSW();
testUpdateSW();
testDeleteSW();
}
@Test
public void testDW() {
testCreateDW();
testUpdateDW();
}
public void testCreateDW() {
int count = getPacsCount();
String user = "ad";
try {
String grantingTicketURL = cas.getGrantingTicketURL(user);
Object execute = addPac(user, grantingTicketURL,
"aaa04", BasePacType.PAC_DW, "176.9.242.77",
640, 4, 1);
assertEquals(count + 1, getPacsCount());
validateAddedPac(execute, BasePacType.PAC_DW, 640, 4, 1);
setPacAdminPassword(user, grantingTicketURL, "aaa04", "test123");
} catch (XmlRpcException e) {
fail(e.getMessage());
}
}
public void testCreateSW() {
int count = getPacsCount();
String user = "ad";
try {
String grantingTicketURL = cas.getGrantingTicketURL(user);
Object execute = addPac(user, grantingTicketURL,
"aaa05", BasePacType.PAC_SW, "176.9.242.77",
1024, 8, -1);
assertEquals(count + 1, getPacsCount());
validateAddedPac(execute, BasePacType.PAC_SW, 1024, 8, -1);
setPacAdminPassword(user, grantingTicketURL, "aaa05", "test123");
} catch (XmlRpcException e) {
fail(e.getMessage());
}
}
public void testUpdateDW() {
String user = "ad";
try {
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, Object> setParams = new HashMap<String, Object>();
Map<String, String> components = new HashMap<String, String>();
setParams.put("basepac", BasePacType.PAC_WEB);
setParams.put("components", components);
// components.put("QUOTA", "2048"); // does not yet work
Map<String, String> whereParams = new HashMap<String, String>();
whereParams.put("name", "aaa04");
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
Object execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
whereParams };
execute = client.execute(MODULE + ".search", params);
assertNotNull(execute);
assertTrue(execute instanceof Object[]);
Object[] untypedResultArray = (Object[]) execute;
assertEquals(1, untypedResultArray.length);
assertTrue(untypedResultArray[0] instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String, ?> pacResultMap = (Map<String, ?>) untypedResultArray[0];
assertEquals(BasePacType.PAC_WEB, pacResultMap.get("basepac"));
Object compMapObj = pacResultMap.get("components");
assertTrue(compMapObj instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String,String> compMap = (Map<String, String>) compMapObj;
assertEquals("1024", compMap.get("QUOTA"));
// assertEquals("2048", compMap.get("QUOTA")); // does not yet work
assertEquals("5", compMap.get("TRAFFIC"));
} catch (XmlRpcException e) {
fail(e.getMessage());
}
}
public void testUpdateSW() {
String user = "ad";
try {
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, Object> setParams = new HashMap<String, Object>();
Map<String, String> components = new HashMap<String, String>();
setParams.put("basepac", BasePacType.PAC_WEB);
setParams.put("components", components);
// components.put("QUOTA", "2048"); // does not yet work
Map<String, String> whereParams = new HashMap<String, String>();
whereParams.put("name", "aaa05");
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
Object execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
whereParams };
execute = client.execute(MODULE + ".search", params);
assertNotNull(execute);
assertTrue(execute instanceof Object[]);
Object[] untypedResultArray = (Object[]) execute;
assertEquals(1, untypedResultArray.length);
assertTrue(untypedResultArray[0] instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String, ?> pacResultMap = (Map<String, ?>) untypedResultArray[0];
assertEquals(BasePacType.PAC_WEB, pacResultMap.get("basepac"));
Object compMapObj = pacResultMap.get("components");
assertTrue(compMapObj instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String,String> compMap = (Map<String, String>) compMapObj;
assertEquals("1024", compMap.get("QUOTA"));
// assertEquals("2048", compMap.get("QUOTA")); // does not yet work
assertEquals("10", compMap.get("TRAFFIC"));
} catch (XmlRpcException e) {
fail(e.getMessage());
}
}
public void testDeleteSW() {
String user = "ad";
try {
int count = getPacsCount();
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, Object> setParams = new HashMap<String, Object>();
setParams.put("created", TextUtil.format(daysBack(10)));
Map<String, String> whereParams = new HashMap<String, String>();
whereParams.put("name", "aaa05");
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
Object execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
setParams = new HashMap<String, Object>();
setParams.put("cancelled", TextUtil.format(daysBack(1)));
whereParams = new HashMap<String, String>();
whereParams.put("name", "aaa05");
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
execute = client.execute(MODULE + ".update", params);
assertNotNull(execute);
whereParams.put("name", "aaa05");
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
whereParams };
execute = client.execute(MODULE + ".delete", params);
assertEquals(count - 1, getPacsCount());
} catch (XmlRpcException e) {
fail(e.getMessage());
}
}
private Date daysBack(int days) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_YEAR, -days);
return calendar.getTime();
}
private int getPacsCount() {
int count = 0;
String user = "hsh00-aaa";
String grantingTicketURL = cas.getGrantingTicketURL(user);
Map<String, String> whereParams = new HashMap<String, String>();
whereParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa");
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
whereParams };
try {
Object execute = client.execute(MODULE + ".search", params);
Object[] result = (Object[]) execute;
count = result.length;
} catch (XmlRpcException e) {
fail(e.getMessage());
}
return count;
}
private Object addPac(String user, String grantingTicketURL,
String pacName, String basepacName, String inetAddr,
int quota, int traffic, int daemons)
throws XmlRpcException {
Map<String, Object> setParams = new HashMap<String, Object>();
setParams.put("name", pacName);
setParams.put("hive", "h99");
setParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa");
setParams.put("basepac", basepacName);
setParams.put("curinetaddr", inetAddr);
HashMap<String, String> components = new HashMap<String, String>();
components.put("QUOTA", Integer.toString(quota));
components.put("TRAFFIC", Integer.toString(traffic));
if (daemons >= 0) {
components.put("DAEMON", Integer.toString(daemons));
}
setParams.put("components", components);
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams };
Object execute = client.execute(MODULE + ".add", params);
assertTrue(execute instanceof Map<?, ?>);
Map<String, Object> whereParams = new HashMap<String, Object>();
whereParams.put("name", pacName);
params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
whereParams };
execute = client.execute(MODULE + ".search", params);
return execute;
}
private void validateAddedPac(Object execute, String basepacName, int quota, int traffic, int daemons) {
assertNotNull(execute);
assertTrue(execute instanceof Object[]);
Object[] untypedResultArray = (Object[]) execute;
assertEquals(1, untypedResultArray.length);
assertTrue(untypedResultArray[0] instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String, ?> pacResultMap = (Map<String, ?>) untypedResultArray[0];
assertEquals(basepacName, pacResultMap.get("basepac"));
Object compMapObj = pacResultMap.get("components");
assertTrue(compMapObj instanceof Map<?,?>);
@SuppressWarnings("unchecked")
Map<String,String> compMap = (Map<String, String>) compMapObj;
assertEquals(Integer.toString(quota), compMap.get("QUOTA"));
assertEquals(Integer.toString(traffic), compMap.get("TRAFFIC"));
if (daemons >= 0) {
assertEquals(Integer.toString(daemons), compMap.get("DAEMON"));
} else {
assertTrue(compMap.get("DAEMON") == null);
}
}
private void setPacAdminPassword(String user, String grantingTicketURL,
String pacName, String password)
throws XmlRpcException {
HashMap<String, Object> whereParams = new HashMap<String, Object>();
HashMap<String, Object> setParams = new HashMap<String, Object>();
whereParams.put("name", pacName);
setParams.put("password", password);
Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),
setParams, whereParams };
client.execute("user.update", params);
}
}

1
hsarback/test/de/hsadmin/remote/RemoteTest.java
View File

@ -18,7 +18,6 @@ import org.junit.runners.Suite;
DomainDeleteTest.class, DomainDeleteTest.class,
EMailAddressTest.class, EMailAddressTest.class,
DatabaseCleanTest.class, DatabaseCleanTest.class,
PacMigrationTest.class,
CustomerTest.class CustomerTest.class
// LongCustomerNameTest.class // LongCustomerNameTest.class
// QueueTaskTest.class // QueueTaskTest.class

2
hsarback/test/de/hsadmin/remote/SSLCertDomainTest.java
View File

@ -79,7 +79,7 @@ public class SSLCertDomainTest {
setParams.put("name", "aaa03"); setParams.put("name", "aaa03");
setParams.put("hive", "h99"); setParams.put("hive", "h99");
setParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa"); setParams.put("customer", config.getProperty("accountprefix.customer") + "-aaa");
setParams.put("basepac", BasePacType.PAC_DW); setParams.put("basepac", BasePacType.PAC_WEB);
setParams.put("curinetaddr", "176.9.242.78"); setParams.put("curinetaddr", "176.9.242.78");
Object[] params = new Object[] { user, Object[] params = new Object[] { user,
cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()), cas.getServiceTicket(grantingTicketURL, RemoteTestHelper.getBackendURL()),