From b0b79e3d5aa2450e0bd7f3bc44a909a551c574c1 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Sun, 13 Feb 2011 06:46:59 +0100
Subject: [PATCH] When network's vlan tag is not null, broadcast uri is
 vlan://<vlanTag>

---
 .../features/NetworkClientLiveTest.java       | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
index 5c525e8268..423f219947 100644
--- a/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
+++ b/sandbox-apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/NetworkClientLiveTest.java
@@ -46,7 +46,7 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
       assertTrue(networkCount >= 0);
       for (Network network : response) {
          Network newDetails = Iterables.getOnlyElement(client.getNetworkClient().listNetworks(
-                  ListNetworksOptions.Builder.id(network.getId())));
+               ListNetworksOptions.Builder.id(network.getId())));
          assertEquals(network, newDetails);
          assertEquals(network, client.getNetworkClient().getNetwork(network.getId()));
          assert network.getId() != null : network;
@@ -55,8 +55,6 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
          assert network.getGuestIPType() != null && network.getGuestIPType() != GuestIPType.UNRECOGNIZED : network;
          assert network.getAccount() != null : network;
          assert network.getBroadcastDomainType() != null : network;
-//         TODO understand when this is null and for what reason
-//         assert network.getBroadcastURI() != null : network;
          assert network.getDisplayText() != null : network;
          assert network.getNetworkDomain() != null : network;
          assert network.getNetworkOfferingAvailability() != null : network;
@@ -71,23 +69,23 @@ public class NetworkClientLiveTest extends BaseCloudStackClientLiveTest {
          assert network.getDomain() != null : network;
          assert network.getDomainId() != null : network;
          switch (network.getGuestIPType()) {
-            case VIRTUAL:
-               assert network.getNetmask() == null : network;
-               assert network.getGateway() == null : network;
-               assert network.getVLAN() == null : network;
-               assert network.getStartIP() == null : network;
-               assert network.getEndIP() == null : network;
-               break;
-            case DIRECT:
-               assert network.getNetmask() != null : network;
-               assert network.getGateway() != null : network;
-               assert network.getVLAN() != null : network;
-               assert network.getStartIP() != null : network;
-               assert network.getEndIP() != null : network;
-               break;
+         case VIRTUAL:
+            assert network.getNetmask() == null : network;
+            assert network.getGateway() == null : network;
+            assert network.getVLAN() == null : network;
+            assert network.getStartIP() == null : network;
+            assert network.getEndIP() == null : network;
+            break;
+         case DIRECT:
+            assert network.getNetmask() != null : network;
+            assert network.getGateway() != null : network;
+            assert network.getVLAN() != null : network;
+            assertEquals(network.getBroadcastURI(), "vlan://" + network.getVLAN());
+            assert network.getStartIP() != null : network;
+            assert network.getEndIP() != null : network;
+            break;
          }
 
       }
    }
-
 }