diff --git a/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/IncrementalDataPlanePlugin.java b/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/IncrementalDataPlanePlugin.java index e10dd0e996a..a509c112764 100644 --- a/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/IncrementalDataPlanePlugin.java +++ b/projects/batfish/src/main/java/org/batfish/dataplane/ibdp/IncrementalDataPlanePlugin.java @@ -30,7 +30,6 @@ public class IncrementalDataPlanePlugin extends DataPlanePlugin { public static final String PLUGIN_NAME = "ibdp"; private final Map>> _flowTraces; - private IncrementalBdpEngine _engine; public IncrementalDataPlanePlugin() { diff --git a/projects/batfish/src/main/java/org/batfish/main/Batfish.java b/projects/batfish/src/main/java/org/batfish/main/Batfish.java index 013e0e0a184..dfbbe76d143 100644 --- a/projects/batfish/src/main/java/org/batfish/main/Batfish.java +++ b/projects/batfish/src/main/java/org/batfish/main/Batfish.java @@ -42,7 +42,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; import java.util.Map; @@ -239,7 +238,6 @@ import org.batfish.z3.SynthesizerInputImpl; import org.batfish.z3.expr.BooleanExpr; import org.batfish.z3.expr.OrExpr; -import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; import org.jgrapht.Graph; @@ -2564,53 +2562,6 @@ public Set loadExternalBgpAnnouncements( return advertSet; } - /** - * Reads the external bgp announcement specified in the environment, and populates the - * vendor-independent configurations with data about those announcements - * - * @param configurations The vendor-independent configurations to be modified - */ - public Set processExternalBgpAnnouncements( - Map configurations, SortedSet allCommunities) { - Set advertSet = new LinkedHashSet<>(); - Path externalBgpAnnouncementsPath = _testrigSettings.getExternalBgpAnnouncementsPath(); - if (Files.exists(externalBgpAnnouncementsPath)) { - String externalBgpAnnouncementsFileContents = - CommonUtil.readFile(externalBgpAnnouncementsPath); - // Populate advertSet with BgpAdvertisements that - // gets passed to populatePrecomputedBgpAdvertisements. - // See populatePrecomputedBgpAdvertisements for the things that get - // extracted from these advertisements. - - try { - JSONObject jsonObj = new JSONObject(externalBgpAnnouncementsFileContents); - - JSONArray announcements = jsonObj.getJSONArray(BfConsts.PROP_BGP_ANNOUNCEMENTS); - - for (int index = 0; index < announcements.length(); index++) { - JSONObject announcement = new JSONObject(); - announcement.put("@id", index); - JSONObject announcementSrc = announcements.getJSONObject(index); - for (Iterator i = announcementSrc.keys(); i.hasNext(); ) { - String key = (String) i.next(); - if (!key.equals("@id")) { - announcement.put(key, announcementSrc.get(key)); - } - } - BgpAdvertisement bgpAdvertisement = - BatfishObjectMapper.mapper() - .readValue(announcement.toString(), BgpAdvertisement.class); - allCommunities.addAll(bgpAdvertisement.getCommunities()); - advertSet.add(bgpAdvertisement); - } - - } catch (JSONException | IOException e) { - throw new BatfishException("Problems parsing JSON in " + externalBgpAnnouncementsPath, e); - } - } - return advertSet; - } - @Override public void processFlows(Set flows, boolean ignoreFilters) { DataPlane dp = loadDataPlane();