Merge branch 'TANGOARCH-895' into 'master'

TANGOARCH-895 : Added shiftArchiver command

See merge request !3

archivingmanager/src/main/java/org/tango/archiving/server/manager/ArchivingManager.java

@@ -590,4 +590,18 @@ public class ArchivingManager {
         return res;
     }
 
+    /**
+     * Moves an attribute from one archiver to another
+     * @param argin attributeName,archiverName
+     * @throws DevFailed if the attribute cannot be moved since it is not archived or if it failed
+     */
+    @Command(name = "ShiftArchiver", inTypeDesc = "attributeName,archiverName")
+    public void shiftArchiver(final String[] argin) throws DevFailed {
+        auditLogger.debug("Entering ShiftArchiver with params {}", String.join(",", argin));
+        if (argin.length != 2) {
+            throw DevFailedUtils.newDevFailed("Invalid number of arguments");
+        }
+        databaseAccess.shiftArchiver(argin[0], argin[1]);
+        auditLogger.debug("Exiting ShiftArchiver");
+    }
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/HDBTDBAccess.java

@@ -217,4 +217,26 @@ public class HDBTDBAccess implements IArchivingAccess {
     public int createNewContext(final String contextName, String description) throws DevFailed {
         throw DevFailedUtils.newDevFailed("Not supported for HDB or TDB");
     }
+
+    @Override
+    public void shiftArchiver(final String attributeName, final String archiverName) throws DevFailed {
+        Mode m;
+        final ArchivingMessConfig archivingMessConfig = ArchivingMessConfig.basicObjectCreation();
+        try {
+            m = dbManager.getArchivingMode(attributeName);
+        } catch (ArchivingException e) {
+            throw e.toTangoException();
+        }
+        AttributeLightMode mode = new AttributeLightMode();
+        mode.setDevice_in_charge(archiverName);
+        mode.setAttributeCompleteName(attributeName);
+        mode.setMode(m);
+        archivingMessConfig.add(mode);
+        try {
+            dbManager.archivingStopConf(attributeName);
+            dbManager.archivingStart(archivingMessConfig);
+        } catch (ArchivingException e) {
+            throw e.toTangoException();
+        }
+    }
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/IArchivingAccess.java

@@ -33,4 +33,6 @@ public interface IArchivingAccess {
     String[] getAllContexts() throws DevFailed;
 
     int createNewContext(final String contextName, String description) throws DevFailed;
+
+    void shiftArchiver(final String attributeName, final String archiverName) throws DevFailed;
 }

archivingmanager/src/main/java/org/tango/archiving/server/manager/TimeseriesAccess.java

@@ -198,4 +198,18 @@ public class TimeseriesAccess implements IArchivingAccess {
         }
         return inserterService.createNewContext(contextName, description);
     }
+
+    @Override
+    public void shiftArchiver(final String attributeName, final String archiverName) throws DevFailed {
+        ArchivingConfigs configs = new ArchivingConfigs();
+        ArchivingConfig archivingConfig = new ArchivingConfig();
+        archivingConfig.setArchiver(archiverName);
+        configService.getAttributeConfig(attributeName).ifPresent(attributeConfig -> {
+            archivingConfig.setAttributeConfig(attributeConfig);
+            archivingConfig.setModes(configService.getCurrentInsertionModes(attributeConfig.getId()).orElse(null));
+            configs.addConfiguration(archivingConfig);
+            service.stopArchiving(attributeName);
+            service.startArchiving(configs);
+        });
+    }
 }