HSAdmin Backend Domains, E-Mail, Datenbanken
Peter Hormanns
2011-07-28 65f11f1ad1c642e7dc7e1a800d641918bcec04e1
delete pac
1 files modified
10 ■■■■■ changed files
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java 10 ●●●●● patch | view | raw | blame | history
hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -44,7 +44,7 @@
        UnixUser unixUser = getPacAdminUser(pac);
        String password = PwGenerator.generatePassword(7, flagBuilder.build(), 100, random);
        Map<String, String> hiveValues = fillHiveValues(hive);
        List<Map<String, String>> pacValuesList = fillPacValuesList(hive);
        List<Map<String, String>> pacValuesList = fillPacValuesList(hive, null);
        Map<String, String> emailVars = fillEMailValues(pacName, customerEMail, password);
        Processor priProcessor = new CompoundProcessor(
                createAddUserProc(pacName, unixUser, password), 
@@ -70,7 +70,7 @@
        Pac pac = (Pac) entity;
        Hive hive = pac.getHive();
        Map<String, String> hiveValues = fillHiveValues(hive);
        List<Map<String, String>> pacValuesList = fillPacValuesList(hive);
        List<Map<String, String>> pacValuesList = fillPacValuesList(hive, pac);
        WaitingTasksProcessor waitingProcessor = new WaitingTasksProcessor(new CompoundProcessor(
                createEtcHostsProc(hiveValues, pacValuesList), 
                createNetworkInterfacesProc(hiveValues, pacValuesList), 
@@ -163,14 +163,16 @@
        return hiveValues;
    }
    private List<Map<String, String>> fillPacValuesList(Hive hive) {
    private List<Map<String, String>> fillPacValuesList(Hive hive, Pac pac) {
        List<Map<String, String>> pacValuesList = new ArrayList<Map<String, String>>();
        Set<Pac> pacsSet = hive.getPacs();
        for (Pac p : pacsSet) {
            HashMap<String, String> pacValues = new HashMap<String, String>();
            pacValues.put("PAC", p.getName());
            pacValues.put("PAC_IP", p.getCurINetAddr().getInetAddr());
            pacValuesList.add(pacValues);
            if (pac == null || pac.getId() != p.getId()) {
                pacValuesList.add(pacValues);
            }
        }
        return pacValuesList;
    }