ConvertConfigurationJob: finalize more collections
package org.batfish.job;
+import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.Multimap;
import java.util.HashMap;
import java.util.Map;
@@ -45,6 +46,12 @@ public class ConvertConfigurationJob extends BatfishJob<ConvertConfigurationResu
}
c.simplifyRoutingPolicies();
c.computeRoutingPolicySources(w);
+ c.setAsPathAccessLists(ImmutableSortedMap.copyOf(c.getAsPathAccessLists()));
+ c.setCommunityLists(ImmutableSortedMap.copyOf(c.getCommunityLists()));
+ c.setIpAccessLists(ImmutableSortedMap.copyOf(c.getIpAccessLists()));
+ c.setIp6AccessLists(ImmutableSortedMap.copyOf(c.getIp6AccessLists()));
+ c.setRouteFilterLists(ImmutableSortedMap.copyOf(c.getRouteFilterLists()));
+ c.setRoute6FilterLists(ImmutableSortedMap.copyOf(c.getRoute6FilterLists()));
}
@Override
@@ -67,8 +74,6 @@ public class ConvertConfigurationJob extends BatfishJob<ConvertConfigurationResu
for (Configuration configuration :
vendorConfiguration.toVendorIndependentConfigurations()) {
- finalizeConfiguration(configuration, warnings);
-
// get iptables if applicable
IptablesVendorConfiguration iptablesConfig = null;
VendorConfiguration ov = vendorConfiguration.getOverlayConfiguration();
@@ -87,6 +92,8 @@ public class ConvertConfigurationJob extends BatfishJob<ConvertConfigurationResu
iptablesConfig.applyAsOverlay(configuration, warnings);
}
+ finalizeConfiguration(configuration, warnings);
+
String hostname = configuration.getHostname();
configurations.put(hostname, configuration);
warningsByHost.put(hostname, warnings);
