Remove SoftLayer patch after jclouds 1.9.2 update

brooklyncentral · Jan 13, 2016 · 2425240 · 2425240
1 parent b19965a
commit 2425240
Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/dist/src/main/assembly/lib/patch/patch-softlayer-clocker-137.jar b/dist/src/main/assembly/lib/patch/patch-softlayer-clocker-137.jar
diff --git a/docker/src/main/java/brooklyn/entity/container/docker/DockerHostImpl.java b/docker/src/main/java/brooklyn/entity/container/docker/DockerHostImpl.java
@@ -672,8 +672,7 @@ protected void preStart() {
                     VirtualGuestApi api = ((JcloudsLocation) location).getComputeService().getContext().unwrapApi(SoftLayerApi.class).getVirtualGuestApi();
                     JcloudsSshMachineLocation machine = (JcloudsSshMachineLocation) getDriver().getLocation();
                     Long serverId = Long.parseLong(machine.getNode().getId());
-                    // TODO getVirtualGuestFiltered(serverId, "primaryBackendNetworkComponent;primaryBackendNetworkComponent.networkVlan");
-                    VirtualGuest guest = api.getVirtualGuest(serverId);
+                    VirtualGuest guest = api.getVirtualGuestFiltered(serverId, "primaryBackendNetworkComponent;primaryBackendNetworkComponent.networkVlan");
                     vlanId = guest.getPrimaryBackendNetworkComponent().getNetworkVlan().getId();
                     Integer vlanNumber = guest.getPrimaryBackendNetworkComponent().getNetworkVlan().getVlanNumber();
                     ((EntityInternal) sensors().get(DOCKER_INFRASTRUCTURE).sensors().get(DockerInfrastructure.SDN_PROVIDER)).sensors().set(SdnProvider.VLAN_ID, vlanId);