Fix sequencer config cleanup (#804)

validator/src/main/java/com/google/daq/mqtt/sequencer/SequenceBase.java

@@ -7,6 +7,7 @@
 import static com.google.common.base.Strings.emptyToNull;
 import static com.google.daq.mqtt.sequencer.SequenceBase.Capabilities.LAST_CONFIG;
 import static com.google.daq.mqtt.sequencer.semantic.SemanticValue.actualize;
+import static com.google.daq.mqtt.util.ConfigGenerator.configFrom;
 import static com.google.daq.mqtt.util.IotReflectorClient.REFLECTOR_PREFIX;
 import static com.google.udmi.util.CleanDateFormat.cleanDate;
 import static com.google.udmi.util.CleanDateFormat.dateEquals;
@@ -236,7 +237,7 @@ public class SequenceBase {
   protected static String cloudRegion;
   protected static String registryId;
   protected static String altRegistry;
-  protected static Config deviceConfig;
+  protected Config deviceConfig;
   protected static IotReflectorClient altClient;
   protected static String serialNo;
   static ExecutionConfiguration exeConfig;
@@ -252,7 +253,6 @@ public class SequenceBase {
   private boolean resetRequired = true;
   private static boolean enableAllTargets = true;
   private static boolean useAlternateClient;
-  private static Config generatedConfig;
 
   static {
     // Sanity check to make sure ALPHA version is increased if forced by increased BETA.
@@ -324,7 +324,6 @@ private static void setupSequencer() {
     registryId = SiteModel.getRegistryActual(exeConfig);
 
     deviceMetadata = readDeviceMetadata();
-    generatedConfig = ConfigGenerator.configFrom(deviceMetadata).deviceConfig();
 
     File baseOutputDir = new File(SequenceBase.siteModel, "out");
     deviceOutputDir = new File(baseOutputDir, "devices/" + getDeviceId());
@@ -654,7 +653,7 @@ private void resetDeviceConfig(boolean clean) {
     debug("Clear configTransactions and reset device config");
     configTransactions.clear();
     sentConfig.clear();
-    deviceConfig = clean ? new Config() : generatedConfig;
+    deviceConfig = clean ? new Config() : configFrom(deviceMetadata).deviceConfig();
     deviceConfig.timestamp = null;
     sanitizeConfig(deviceConfig);
     deviceConfig.system.min_loglevel = Level.INFO.value();