Merge pull request #169 from batfish/unstable

batfish-0.28.0
batfish · Jul 1, 2017 · 15fffee · 15fffee
2 parents 60bbeab + 3d146a4
commit 15fffee
Show file tree

Hide file tree

Showing 29 changed files with 1,559 additions and 1,383 deletions.
diff --git a/lib/commons/commons-io-2.4-sources.jar b/lib/commons/commons-io-2.4-sources.jar
diff --git a/projects/batfish-client/src/org/batfish/client/BfCoordWorkHelper.java b/projects/batfish-client/src/org/batfish/client/BfCoordWorkHelper.java
@@ -1093,25 +1093,23 @@ public boolean uploadCustomObject(String containerName, String testrigName,
    }
 
    public boolean uploadEnvironment(String containerName, String testrigName,
-         String envName, String zipfileName) {
+         String baseEnvName, String envName, String zipfileName) {
       try {
-
          Client client = getClientBuilder().build();
          WebTarget webTarget = getTarget(client,
                CoordConsts.SVC_RSC_UPLOAD_ENV);
-
          MultiPart multiPart = new MultiPart();
          multiPart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE);
-
          addTextMultiPart(multiPart, CoordConsts.SVC_KEY_API_KEY,
                _settings.getApiKey());
          addTextMultiPart(multiPart, CoordConsts.SVC_KEY_CONTAINER_NAME,
                containerName);
          addTextMultiPart(multiPart, CoordConsts.SVC_KEY_TESTRIG_NAME,
                testrigName);
+         addTextMultiPart(multiPart, CoordConsts.SVC_KEY_BASE_ENV_NAME,
+               baseEnvName);
          addTextMultiPart(multiPart, CoordConsts.SVC_KEY_ENV_NAME, envName);
          addFileMultiPart(multiPart, CoordConsts.SVC_KEY_ZIPFILE, zipfileName);
-
          return postData(webTarget, multiPart) != null;
       }
       catch (Exception e) {