You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/07/23 11:11:29 UTC

[2/4] CLOUDSTACK-6823 : First code drop for Brocade Network plugin to orchestrate Brocade VDX switches for L2 connectivity

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java b/plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java
new file mode 100644
index 0000000..bf30bd0
--- /dev/null
+++ b/plugins/network-elements/brocade-vcs/test/com/cloud/network/guru/BrocadeVcsGuestNetworkGuruTest.java
@@ -0,0 +1,590 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.network.guru;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.agent.api.AssociateMacToNetworkAnswer;
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.CreateNetworkAnswer;
+import com.cloud.agent.api.DeleteNetworkAnswer;
+import com.cloud.agent.api.DisassociateMacFromNetworkAnswer;
+import com.cloud.dc.DataCenter;
+import com.cloud.dc.DataCenter.NetworkType;
+import com.cloud.dc.DataCenterVO;
+import com.cloud.dc.dao.DataCenterDao;
+import com.cloud.deploy.DeployDestination;
+import com.cloud.deploy.DeploymentPlan;
+import com.cloud.domain.Domain;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientVirtualNetworkCapacityException;
+import com.cloud.host.HostVO;
+import com.cloud.host.dao.HostDao;
+import com.cloud.network.BrocadeVcsDeviceVO;
+import com.cloud.network.BrocadeVcsNetworkVlanMappingVO;
+import com.cloud.network.Network;
+import com.cloud.network.Network.GuestType;
+import com.cloud.network.Network.Service;
+import com.cloud.network.Network.State;
+import com.cloud.network.NetworkModel;
+import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.TrafficType;
+import com.cloud.network.dao.BrocadeVcsDao;
+import com.cloud.network.dao.BrocadeVcsNetworkVlanMappingDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.network.dao.PhysicalNetworkDao;
+import com.cloud.network.dao.PhysicalNetworkVO;
+import com.cloud.offering.NetworkOffering;
+import com.cloud.offerings.dao.NetworkOfferingServiceMapDao;
+import com.cloud.user.Account;
+import com.cloud.vm.Nic.ReservationStrategy;
+import com.cloud.vm.NicProfile;
+import com.cloud.vm.ReservationContext;
+import com.cloud.vm.VirtualMachineProfile;
+
+public class BrocadeVcsGuestNetworkGuruTest {
+    private static final long NETWORK_ID = 42L;
+    PhysicalNetworkDao physnetdao = mock(PhysicalNetworkDao.class);
+    BrocadeVcsDao vcsdao = mock(BrocadeVcsDao.class);
+    BrocadeVcsNetworkVlanMappingDao vcsmapdao = mock(BrocadeVcsNetworkVlanMappingDao.class);
+    DataCenterDao dcdao = mock(DataCenterDao.class);
+    NetworkOfferingServiceMapDao nosd = mock(NetworkOfferingServiceMapDao.class);
+    AgentManager agentmgr = mock(AgentManager.class);
+    NetworkOrchestrationService netmgr = mock(NetworkOrchestrationService.class);
+    NetworkModel netmodel = mock(NetworkModel.class);
+
+    HostDao hostdao = mock(HostDao.class);
+    NetworkDao netdao = mock(NetworkDao.class);
+    GuestNetworkGuru guestGuru = mock(GuestNetworkGuru.class);
+    BrocadeVcsGuestNetworkGuru guru;
+
+    @Before
+    public void setUp() {
+
+        guru = new BrocadeVcsGuestNetworkGuru();
+        ((GuestNetworkGuru)guru)._physicalNetworkDao = physnetdao;
+        guru._brocadeVcsDao = vcsdao;
+        guru._brocadeVcsNetworkVlanDao = vcsmapdao;
+        guru._hostDao = hostdao;
+        guru._ntwkOfferingSrvcDao = nosd;
+        guru._dcDao = dcdao;
+        guru._agentMgr = agentmgr;
+
+        final DataCenterVO dc = mock(DataCenterVO.class);
+        when(dc.getNetworkType()).thenReturn(NetworkType.Advanced);
+        when(dc.getGuestNetworkCidr()).thenReturn("10.1.1.1/24");
+
+        when(dcdao.findById((Long)any())).thenReturn(dc);
+    }
+
+    @Test
+    public void testCanHandle() {
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VCS"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
+
+        assertTrue(guru.canHandle(offering, NetworkType.Advanced, physnet) == true);
+
+        // Not supported TrafficType != Guest
+        when(offering.getTrafficType()).thenReturn(TrafficType.Management);
+        assertFalse(guru.canHandle(offering, NetworkType.Advanced, physnet) == true);
+
+        // Not supported: GuestType Shared
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Shared);
+        assertFalse(guru.canHandle(offering, NetworkType.Advanced, physnet) == true);
+
+        // Not supported: Basic networking
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+        assertFalse(guru.canHandle(offering, NetworkType.Basic, physnet) == true);
+
+        // Not supported: IsolationMethod != VCS
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VLAN"}));
+        assertFalse(guru.canHandle(offering, NetworkType.Advanced, physnet) == true);
+
+    }
+
+    @Test
+    public void testDesign() {
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnetdao.findById((Long)any())).thenReturn(physnet);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VCS"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
+
+        final DeploymentPlan plan = mock(DeploymentPlan.class);
+        final Network network = mock(Network.class);
+        final Account account = mock(Account.class);
+
+        final Network designednetwork = guru.design(offering, plan, network, account);
+        assertTrue(designednetwork != null);
+        assertTrue(designednetwork.getBroadcastDomainType() == BroadcastDomainType.Vcs);
+    }
+
+    @Test
+    public void testDesignNoIsolationMethodVCS() {
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnetdao.findById((Long)any())).thenReturn(physnet);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VLAN"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        final DeploymentPlan plan = mock(DeploymentPlan.class);
+        final Network network = mock(Network.class);
+        final Account account = mock(Account.class);
+
+        final Network designednetwork = guru.design(offering, plan, network, account);
+        assertTrue(designednetwork == null);
+    }
+
+    @Test
+    public void testDesignNoConnectivityInOffering() {
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnetdao.findById((Long)any())).thenReturn(physnet);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VCS"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
+
+        final DeploymentPlan plan = mock(DeploymentPlan.class);
+        final Network network = mock(Network.class);
+        final Account account = mock(Account.class);
+
+        final Network designednetwork = guru.design(offering, plan, network, account);
+        assertTrue(designednetwork == null);
+    }
+
+    @Test
+    public void testImplement() throws InsufficientVirtualNetworkCapacityException, URISyntaxException {
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnetdao.findById((Long)any())).thenReturn(physnet);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VCS"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(true);
+
+        mock(DeploymentPlan.class);
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getBroadcastUri()).thenReturn(new URI("vlan://14"));
+
+        final DeployDestination dest = mock(DeployDestination.class);
+
+        final DataCenter dc = mock(DataCenter.class);
+        when(dest.getDataCenter()).thenReturn(dc);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        List<BrocadeVcsDeviceVO> devices = new ArrayList();
+        devices.add(brocadeDevice);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final Domain dom = mock(Domain.class);
+        when(dom.getName()).thenReturn("domain");
+        final Account acc = mock(Account.class);
+        when(acc.getAccountName()).thenReturn("accountname");
+        final ReservationContext res = mock(ReservationContext.class);
+        when(res.getDomain()).thenReturn(dom);
+        when(res.getAccount()).thenReturn(acc);
+
+        when(guestGuru.implement(network, offering, dest, res)).thenReturn(network);
+
+        final CreateNetworkAnswer answer = mock(CreateNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        final Network implementednetwork = guru.implement(network, offering, dest, res);
+        assertTrue(implementednetwork != null);
+        verify(agentmgr, times(1)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testImplementFail() throws InsufficientVirtualNetworkCapacityException, URISyntaxException {
+        final PhysicalNetworkVO physnet = mock(PhysicalNetworkVO.class);
+        when(physnetdao.findById((Long)any())).thenReturn(physnet);
+        when(physnet.getIsolationMethods()).thenReturn(Arrays.asList(new String[] {"VCS"}));
+        when(physnet.getId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        when(nosd.areServicesSupportedByNetworkOffering(NETWORK_ID, Service.Connectivity)).thenReturn(false);
+
+        mock(DeploymentPlan.class);
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getBroadcastUri()).thenReturn(new URI("vlan://14"));
+
+        final DeployDestination dest = mock(DeployDestination.class);
+
+        final DataCenter dc = mock(DataCenter.class);
+        when(dest.getDataCenter()).thenReturn(dc);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = mock(List.class);
+        when(devices.isEmpty()).thenReturn(true);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final Domain dom = mock(Domain.class);
+        when(dom.getName()).thenReturn("domain");
+        final Account acc = mock(Account.class);
+        when(acc.getAccountName()).thenReturn("accountname");
+        final ReservationContext res = mock(ReservationContext.class);
+        when(res.getDomain()).thenReturn(dom);
+        when(res.getAccount()).thenReturn(acc);
+
+        when(guestGuru.implement(network, offering, dest, res)).thenReturn(network);
+
+        final CreateNetworkAnswer answer = mock(CreateNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        final Network implementednetwork = guru.implement(network, offering, dest, res);
+        assertTrue(implementednetwork == null);
+        verify(agentmgr, times(0)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testReserve() throws InsufficientVirtualNetworkCapacityException, URISyntaxException, InsufficientAddressCapacityException {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getBroadcastUri()).thenReturn(new URI("vlan://14"));
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NicProfile nic = mock(NicProfile.class);
+        when(nic.getMacAddress()).thenReturn("macaddress");
+        when(nic.getReservationStrategy()).thenReturn(ReservationStrategy.Start);
+
+        final VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+
+        final DeployDestination dest = mock(DeployDestination.class);
+
+        final DataCenterVO dc = mock(DataCenterVO.class);
+        when(dest.getDataCenter()).thenReturn(dc);
+        when(dcdao.findById((long)anyInt())).thenReturn(dc);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        List<BrocadeVcsDeviceVO> devices = new ArrayList();
+        devices.add(brocadeDevice);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final Domain dom = mock(Domain.class);
+        when(dom.getName()).thenReturn("domain");
+        final Account acc = mock(Account.class);
+        when(acc.getAccountName()).thenReturn("accountname");
+        final ReservationContext res = mock(ReservationContext.class);
+        when(res.getDomain()).thenReturn(dom);
+        when(res.getAccount()).thenReturn(acc);
+
+        final AssociateMacToNetworkAnswer answer = mock(AssociateMacToNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        guru.reserve(nic, network, vmProfile, dest, res);
+        verify(agentmgr, times(1)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testReserveFail() throws InsufficientVirtualNetworkCapacityException, URISyntaxException, InsufficientAddressCapacityException {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getBroadcastUri()).thenReturn(new URI("vlan://14"));
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NicProfile nic = mock(NicProfile.class);
+        when(nic.getMacAddress()).thenReturn("macaddress");
+        when(nic.getReservationStrategy()).thenReturn(ReservationStrategy.Start);
+
+        final VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+
+        final DeployDestination dest = mock(DeployDestination.class);
+
+        final DataCenterVO dc = mock(DataCenterVO.class);
+        when(dest.getDataCenter()).thenReturn(dc);
+        when(dcdao.findById((long)anyInt())).thenReturn(dc);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = mock(List.class);
+        when(devices.isEmpty()).thenReturn(true);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final Domain dom = mock(Domain.class);
+        when(dom.getName()).thenReturn("domain");
+        final Account acc = mock(Account.class);
+        when(acc.getAccountName()).thenReturn("accountname");
+        final ReservationContext res = mock(ReservationContext.class);
+        when(res.getDomain()).thenReturn(dom);
+        when(res.getAccount()).thenReturn(acc);
+
+        final AssociateMacToNetworkAnswer answer = mock(AssociateMacToNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        guru.reserve(nic, network, vmProfile, dest, res);
+        verify(agentmgr, times(0)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testDeallocate() {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NicProfile nic = mock(NicProfile.class);
+        when(nic.getMacAddress()).thenReturn("macaddress");
+        when(nic.getReservationStrategy()).thenReturn(ReservationStrategy.Start);
+
+        final VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = new ArrayList();
+        devices.add(brocadeDevice);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final DisassociateMacFromNetworkAnswer answer = mock(DisassociateMacFromNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        guru.deallocate(network, nic, vmProfile);
+        verify(agentmgr, times(1)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testDeallocateFail() {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getPhysicalNetworkId()).thenReturn(NETWORK_ID);
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NicProfile nic = mock(NicProfile.class);
+        when(nic.getMacAddress()).thenReturn("macaddress");
+        when(nic.getReservationStrategy()).thenReturn(ReservationStrategy.Start);
+
+        final VirtualMachineProfile vmProfile = mock(VirtualMachineProfile.class);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = mock(List.class);
+        when(devices.isEmpty()).thenReturn(true);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final DisassociateMacFromNetworkAnswer answer = mock(DisassociateMacFromNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        guru.deallocate(network, nic, vmProfile);
+        verify(agentmgr, times(0)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testTrash() {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getId()).thenReturn(NETWORK_ID);
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsNetworkVlanMappingVO mapping = mock(BrocadeVcsNetworkVlanMappingVO.class);
+        when(mapping.getVlanId()).thenReturn(14);
+        when(vcsmapdao.findByNetworkId(anyLong())).thenReturn(mapping);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = new ArrayList();
+        devices.add(brocadeDevice);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final DeleteNetworkAnswer answer = mock(DeleteNetworkAnswer.class);
+        when(answer.getResult()).thenReturn(true);
+        when(agentmgr.easySend(eq(NETWORK_ID), (Command)any())).thenReturn(answer);
+
+        when(vcsdao.remove((long)anyInt())).thenReturn(true);
+
+        final boolean result = guru.trash(network, offering);
+        assertTrue(result == true);
+        verify(agentmgr, times(1)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+
+    @Test
+    public void testTrashFail() {
+
+        final NetworkVO network = mock(NetworkVO.class);
+        when(network.getName()).thenReturn("testnetwork");
+        when(network.getState()).thenReturn(State.Implementing);
+        when(network.getId()).thenReturn(NETWORK_ID);
+        when(network.getDataCenterId()).thenReturn(NETWORK_ID);
+
+        final NetworkOffering offering = mock(NetworkOffering.class);
+        when(offering.getId()).thenReturn(NETWORK_ID);
+        when(offering.getTrafficType()).thenReturn(TrafficType.Guest);
+        when(offering.getGuestType()).thenReturn(GuestType.Isolated);
+
+        final HostVO brocadeHost = mock(HostVO.class);
+        when(hostdao.findById(anyLong())).thenReturn(brocadeHost);
+        when(brocadeHost.getId()).thenReturn(NETWORK_ID);
+
+        when(netmodel.findPhysicalNetworkId(anyLong(), (String)any(), (TrafficType)any())).thenReturn(NETWORK_ID);
+
+        final BrocadeVcsNetworkVlanMappingVO mapping = mock(BrocadeVcsNetworkVlanMappingVO.class);
+        when(mapping.getVlanId()).thenReturn(14);
+        when(vcsmapdao.findByNetworkId(anyLong())).thenReturn(mapping);
+        when(vcsmapdao.remove(anyLong())).thenReturn(true);
+
+        final BrocadeVcsDeviceVO brocadeDevice = mock(BrocadeVcsDeviceVO.class);
+        when(brocadeDevice.getHostId()).thenReturn(NETWORK_ID);
+
+        final List<BrocadeVcsDeviceVO> devices = mock(List.class);
+        when(devices.isEmpty()).thenReturn(true);
+        when(vcsdao.listByPhysicalNetwork(anyLong())).thenReturn(devices);
+
+        final boolean result = guru.trash(network, offering);
+        assertTrue(result == false);
+        verify(agentmgr, times(0)).easySend(eq(NETWORK_ID), (Command)any());
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java b/plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java
new file mode 100644
index 0000000..f903d0e
--- /dev/null
+++ b/plugins/network-elements/brocade-vcs/test/com/cloud/network/resource/BrocadeVcsResourceTest.java
@@ -0,0 +1,261 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.network.resource;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.naming.ConfigurationException;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.cloud.agent.api.AssociateMacToNetworkAnswer;
+import com.cloud.agent.api.AssociateMacToNetworkCommand;
+import com.cloud.agent.api.CreateNetworkAnswer;
+import com.cloud.agent.api.CreateNetworkCommand;
+import com.cloud.agent.api.DeleteNetworkAnswer;
+import com.cloud.agent.api.DeleteNetworkCommand;
+import com.cloud.agent.api.DisassociateMacFromNetworkAnswer;
+import com.cloud.agent.api.DisassociateMacFromNetworkCommand;
+import com.cloud.agent.api.PingCommand;
+import com.cloud.agent.api.StartupCommand;
+import com.cloud.host.Host;
+import com.cloud.network.brocade.BrocadeVcsApi;
+import com.cloud.network.brocade.BrocadeVcsApiException;
+import com.cloud.network.schema.showvcs.Output;
+import com.cloud.network.schema.showvcs.VcsNodeInfo;
+import com.cloud.network.schema.showvcs.VcsNodes;
+
+public class BrocadeVcsResourceTest {
+
+    private static final long NETWORK_ID = 42L;
+    private static final int VLAN_ID = 14;
+    private static final String MAC_ADDRESS_32 = "0050.56bf.0002";
+    private static final String MAC_ADDRESS_64 = "00:50:56:bf:00:02";
+    BrocadeVcsApi api = mock(BrocadeVcsApi.class);
+    BrocadeVcsResource resource;
+    Map<String, Object> parameters;
+
+    @Before
+    public void setUp() throws ConfigurationException {
+        resource = new BrocadeVcsResource() {
+            @Override
+            protected BrocadeVcsApi createBrocadeVcsApi(String ip, String username, String password) {
+                return api;
+            }
+        };
+
+        parameters = new HashMap<String, Object>();
+        parameters.put("name", "vcstestdevice");
+        parameters.put("ip", "127.0.0.1");
+        parameters.put("adminuser", "adminuser");
+        parameters.put("guid", "aaaaa-bbbbb-ccccc");
+        parameters.put("zoneId", "blublub");
+        parameters.put("adminpass", "adminpass");
+    }
+
+    @Test(expected = ConfigurationException.class)
+    public void resourceConfigureFailure() throws ConfigurationException {
+        resource.configure("BrocadeVcsResource", Collections.<String, Object> emptyMap());
+    }
+
+    @Test
+    public void resourceConfigure() throws ConfigurationException {
+        resource.configure("BrocadeVcsResource", parameters);
+        assertTrue("Incorrect resource name", "vcstestdevice".equals(resource.getName()));
+
+        assertTrue("Incorrect resource type", resource.getType() == Host.Type.L2Networking);
+    }
+
+    @Test
+    public void testInitialization() throws ConfigurationException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        final StartupCommand[] sc = resource.initialize();
+        assertTrue(sc.length == 1);
+        assertTrue("Incorrect startup command GUID", "aaaaa-bbbbb-ccccc".equals(sc[0].getGuid()));
+        assertTrue("Incorrect Brocade device name", "vcstestdevice".equals(sc[0].getName()));
+        assertTrue("Incorrect Data Center", "blublub".equals(sc[0].getDataCenter()));
+    }
+
+    @Test
+    public void testPingCommandStatusOk() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        final VcsNodeInfo nodeInfo = mock(VcsNodeInfo.class);
+        when(nodeInfo.getNodeState()).thenReturn("Online");
+
+        List<VcsNodeInfo> nodes = new ArrayList<VcsNodeInfo>();
+        nodes.add(nodeInfo);
+
+        final VcsNodes vcsNodes = mock(VcsNodes.class);
+        final Output output = mock(Output.class);
+        when(output.getVcsNodes()).thenReturn(vcsNodes);
+        when(vcsNodes.getVcsNodeInfo()).thenReturn(nodes);
+        when(api.getSwitchStatus()).thenReturn(output);
+
+        final PingCommand ping = resource.getCurrentStatus(42);
+        assertTrue(ping != null);
+        assertTrue(ping.getHostId() == 42);
+        assertTrue(ping.getHostType() == Host.Type.L2Networking);
+
+    }
+
+    @Test
+    public void testPingCommandStatusFail() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        final VcsNodeInfo nodeInfo = mock(VcsNodeInfo.class);
+        when(nodeInfo.getNodeState()).thenReturn("Offline");
+
+        List<VcsNodeInfo> nodes = new ArrayList<VcsNodeInfo>();
+        nodes.add(nodeInfo);
+
+        final VcsNodes vcsNodes = mock(VcsNodes.class);
+        final Output output = mock(Output.class);
+        when(output.getVcsNodes()).thenReturn(vcsNodes);
+        when(vcsNodes.getVcsNodeInfo()).thenReturn(nodes);
+        when(api.getSwitchStatus()).thenReturn(output);
+
+        final PingCommand ping = resource.getCurrentStatus(42);
+        assertTrue(ping == null);
+    }
+
+    @Test
+    public void testPingCommandStatusApiException() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+        when(api.getSwitchStatus()).thenThrow(new BrocadeVcsApiException());
+
+        final PingCommand ping = resource.getCurrentStatus(42);
+        assertTrue(ping == null);
+    }
+
+    @Test
+    public void testRetries() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.createNetwork(VLAN_ID, NETWORK_ID)).thenThrow(new BrocadeVcsApiException()).thenThrow(new BrocadeVcsApiException()).thenReturn(true);
+
+        final CreateNetworkCommand cmd = new CreateNetworkCommand(VLAN_ID, NETWORK_ID, "owner");
+        final CreateNetworkAnswer answer = (CreateNetworkAnswer)resource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+
+    }
+
+    @Test
+    public void testCreateNetworkApi() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.createNetwork(VLAN_ID, NETWORK_ID)).thenReturn(true);
+
+        final CreateNetworkCommand cmd = new CreateNetworkCommand(VLAN_ID, NETWORK_ID, "owner");
+        final CreateNetworkAnswer answer = (CreateNetworkAnswer)resource.executeRequest(cmd);
+        //verify(api).createNetwork(VLAN_ID, NETWORK_ID);
+        assertTrue(answer.getResult());
+
+    }
+
+    @Test
+    public void testCreateNetworkApiException() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.createNetwork(VLAN_ID, NETWORK_ID)).thenThrow(new BrocadeVcsApiException());
+
+        final CreateNetworkCommand cmd = new CreateNetworkCommand(VLAN_ID, NETWORK_ID, "owner");
+        final CreateNetworkAnswer answer = (CreateNetworkAnswer)resource.executeRequest(cmd);
+        assertFalse(answer.getResult());
+
+    }
+
+    @Test
+    public void testDeleteNetworkApi() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.deleteNetwork(VLAN_ID, NETWORK_ID)).thenReturn(true);
+
+        final DeleteNetworkCommand cmd = new DeleteNetworkCommand(VLAN_ID, NETWORK_ID);
+        final DeleteNetworkAnswer answer = (DeleteNetworkAnswer)resource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testDeleteNetworkApiException() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.deleteNetwork(VLAN_ID, NETWORK_ID)).thenThrow(new BrocadeVcsApiException());
+
+        final DeleteNetworkCommand cmd = new DeleteNetworkCommand(VLAN_ID, NETWORK_ID);
+        final DeleteNetworkAnswer answer = (DeleteNetworkAnswer)resource.executeRequest(cmd);
+        assertFalse(answer.getResult());
+    }
+
+    @Test
+    public void testAssociateMacToNetworkApi() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.associateMacToNetwork(NETWORK_ID, MAC_ADDRESS_32)).thenReturn(true);
+
+        final AssociateMacToNetworkCommand cmd = new AssociateMacToNetworkCommand(NETWORK_ID, MAC_ADDRESS_64, "owner");
+        final AssociateMacToNetworkAnswer answer = (AssociateMacToNetworkAnswer)resource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testAssociateMacToNetworkApiException() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.associateMacToNetwork(NETWORK_ID, MAC_ADDRESS_32)).thenThrow(new BrocadeVcsApiException());
+
+        final AssociateMacToNetworkCommand cmd = new AssociateMacToNetworkCommand(NETWORK_ID, MAC_ADDRESS_64, "owner");
+        final AssociateMacToNetworkAnswer answer = (AssociateMacToNetworkAnswer)resource.executeRequest(cmd);
+        assertFalse(answer.getResult());
+    }
+
+    @Test
+    public void testDisassociateMacFromNetworkApi() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.disassociateMacFromNetwork(NETWORK_ID, MAC_ADDRESS_32)).thenReturn(true);
+
+        final DisassociateMacFromNetworkCommand cmd = new DisassociateMacFromNetworkCommand(NETWORK_ID, MAC_ADDRESS_64);
+        final DisassociateMacFromNetworkAnswer answer = (DisassociateMacFromNetworkAnswer)resource.executeRequest(cmd);
+        assertTrue(answer.getResult());
+    }
+
+    @Test
+    public void testDisassociateMacFromNetworkApiException() throws ConfigurationException, BrocadeVcsApiException {
+        resource.configure("BrocadeVcsResource", parameters);
+
+        when(api.disassociateMacFromNetwork(NETWORK_ID, MAC_ADDRESS_32)).thenThrow(new BrocadeVcsApiException());
+
+        final DisassociateMacFromNetworkCommand cmd = new DisassociateMacFromNetworkCommand(NETWORK_ID, MAC_ADDRESS_64);
+        final DisassociateMacFromNetworkAnswer answer = (DisassociateMacFromNetworkAnswer)resource.executeRequest(cmd);
+        assertFalse(answer.getResult());
+    }
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index eff5a01..b3890c0 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -64,6 +64,7 @@
     <module>network-elements/netscaler</module>
     <module>network-elements/nicira-nvp</module>
     <module>network-elements/bigswitch-vns</module>
+    <module>network-elements/brocade-vcs</module>
     <module>network-elements/midonet</module>
     <module>network-elements/stratosphere-ssp</module>
     <module>network-elements/opendaylight</module>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/setup/db/db/schema-440to450.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-440to450.sql b/setup/db/db/schema-440to450.sql
index 6cb81c6..d727f21 100644
--- a/setup/db/db/schema-440to450.sql
+++ b/setup/db/db/schema-440to450.sql
@@ -244,6 +244,26 @@ CREATE VIEW `cloud`.`volume_view` AS
             and async_job.instance_type = 'Volume'
             and async_job.job_status = 0;
 
+CREATE TABLE `cloud`.`external_brocade_vcs_devices` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `uuid` varchar(255) UNIQUE,
+  `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which brocade vcs switch is added',
+  `provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this brocade vcs switch',
+  `device_name` varchar(255) NOT NULL COMMENT 'name of the brocade vcs switch',
+  `host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external brocade vcs switch',
+  PRIMARY KEY  (`id`),
+  CONSTRAINT `fk_external_brocade_vcs_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE,
+  CONSTRAINT `fk_external_brocade_vcs_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `cloud`.`brocade_network_vlan_map` (
+  `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+  `network_id` bigint unsigned NOT NULL COMMENT 'id of the network',
+  `vlan_id` int(10) COMMENT 'vlan id of the network',
+  PRIMARY KEY  (`id`),
+   CONSTRAINT `fk_brocade_network_vlan_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
 /* As part of the separation of Xen and XenServer, update the column for the network labels */
 ALTER TABLE `cloud`.`physical_network_traffic_types` CHANGE `xen_network_label` `xenserver_network_label` varchar(255) COMMENT 'The network name label of the physical device dedicated to this traffic on a XenServer host';
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/test/integration/component/test_brocade_vcs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_brocade_vcs.py b/test/integration/component/test_brocade_vcs.py
new file mode 100644
index 0000000..556de28
--- /dev/null
+++ b/test/integration/component/test_brocade_vcs.py
@@ -0,0 +1,333 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+""" P1 tests for brocade
+"""
+#Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackAPI import *
+from marvin.lib.utils import (cleanup_resources,
+                              random_gen, validateList)
+from marvin.lib.base import (Account,
+                             VirtualMachine,
+                             PublicIPAddress,
+                             LoadBalancerRule,
+                             ServiceOffering,
+                             NetworkOffering,
+                             Host,
+                             Network,
+                             NATRule,
+                             Configurations)
+from marvin.lib.common import (get_domain,
+                               get_zone,
+                               get_template)
+from marvin.sshClient import SshClient
+from marvin.codes import PASS
+import time
+
+
+class Services:
+    """Test brocade plugin
+    """
+
+    def __init__(self):
+        self.services = {
+                         "account": {
+                                    "email": "test@test.com",
+                                    "firstname": "Test",
+                                    "lastname": "User",
+                                    "username": "test",
+                                    # Random characters are appended for unique
+                                    # username
+                                    "password": "password",
+                         },
+                         "service_offering": {
+                                    "name": "Tiny Instance",
+                                    "displaytext": "Tiny Instance",
+                                    "cpunumber": 1,
+                                    "cpuspeed": 100,    # in MHz
+                                    "memory": 128,       # In MBs
+                         },
+                         "virtual_machine": {
+                                    "displayname": "TestVM",
+                                    "username": "root",
+                                    "password": "password",
+                                    "ssh_port": 22,
+                                    "hypervisor": 'XenServer',
+                                    "privateport": 22,
+                                    "publicport": 22,
+                                    "protocol": 'TCP',
+                                },
+                         "brocade": {
+                                "ipaddress": '10.24.51.45',
+                                "username": 'admin',
+                                "password": 'password123'
+                         },
+                         "network_offering": {
+                                    "name": 'Brocade',
+                                    "displaytext": 'Brocade',
+                                    "guestiptype": 'Isolated',
+                                    "supportedservices": 'SourceNat,Connectivity',
+                                    "traffictype": 'GUEST',
+                                    "availability": 'Optional',
+                                    "serviceProviderList": {
+                                            "SourceNat": 'VirtualRouter',
+                                            "Connectivity" : 'BrocadeVcs'
+                                    },
+                         },
+                         "network": {
+                                  "name": "Brocade",
+                                  "displaytext": "Brocade",
+                         },
+                         "ostype": 'CentOS 5.3 (64-bit)',
+                         # Cent OS 5.3 (64 bit)
+                         "sleep": 60,
+                         "timeout": 10
+                    }
+
+class TestBrocadeVcs(cloudstackTestCase):
+
+
+    @classmethod
+    def setUpClass(cls):
+        cls._cleanup = []
+        cls.testClient = super(TestBrocadeVcs, cls).getClsTestClient()
+        cls.api_client = cls.testClient.getApiClient()
+
+        cls.services = Services().services
+        # Get Zone, Domain and templates
+        cls.domain = get_domain(cls.api_client)
+        cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+        cls.template = get_template(
+                            cls.api_client,
+                            cls.zone.id,
+                            cls.services["ostype"]
+                           )
+        cls.brocade_services = cls.services["brocade"]
+        try:
+
+           """ Adds Brocade device and enables NS provider"""
+           cmd = listPhysicalNetworks.listPhysicalNetworksCmd()
+           cmd.zoneid = cls.zone.id
+           physical_networks = cls.api_client.listPhysicalNetworks(cmd)
+           if isinstance(physical_networks, list):
+               physical_network = physical_networks[0]
+           cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
+           cmd.name = 'BrocadeVcs'
+           cmd.physicalnetworkid = physical_network.id
+           nw_service_providers = cls.api_client.listNetworkServiceProviders(cmd)
+
+           if isinstance(nw_service_providers, list):
+               brocade_provider = nw_service_providers[0]
+           else:
+               cmd1 = addNetworkServiceProvider.addNetworkServiceProviderCmd()
+               cmd1.name = 'BrocadeVcs'
+               cmd1.physicalnetworkid = physical_network.id
+               brocade_provider = cls.api_client.addNetworkServiceProvider(cmd1)
+
+           cmd2 = addBrocadeVcsDevice.addBrocadeVcsDeviceCmd()
+           cmd2.physicalnetworkid = physical_network.id
+           cmd2.username = cls.brocade_services["username"]
+           cmd2.password = cls.brocade_services["password"]
+           cmd2.hostname = cls.brocade_services["ipaddress"]
+           cls.brocade = cls.api_client.addBrocadeVcsDevice(cmd2)
+
+           if brocade_provider.state != 'Enabled':
+               cmd = updateNetworkServiceProvider.updateNetworkServiceProviderCmd()
+               cmd.id = brocade_provider.id
+               cmd.state = 'Enabled'
+               cls.api_client.updateNetworkServiceProvider(cmd)
+
+
+           cls.network_offering = NetworkOffering.create(
+                                            cls.api_client,
+                                            cls.services["network_offering"],
+                                            conservemode=True
+                                            )
+           cls._cleanup.append(cls.network_offering)
+
+           # Enable Network offering
+           cls.network_offering.update(cls.api_client, state='Enabled')
+           cls.services["virtual_machine"]["zoneid"] = cls.zone.id
+           cls.services["virtual_machine"]["template"] = cls.template.id
+           cls.service_offering = ServiceOffering.create(
+                                            cls.api_client,
+                                            cls.services["service_offering"]
+                                            )
+           cls._cleanup.append(cls.service_offering)
+        except Exception as e:
+           cls.tearDownClass()
+           raise Exception ("Warning: Exception in setUpClass: %s" % e)
+        return
+
+    @classmethod
+    def tearDownClass(cls):
+        try:
+            #Cleanup resources used
+            cmd = deleteBrocadeVcsDevice.deleteBrocadeVcsDeviceCmd()
+            cmd.vcsdeviceid = cls.brocade.vcsdeviceid
+            cls.brocade = cls.api_client.deleteBrocadeVcsDevice(cmd)
+            cleanup_resources(cls.api_client, cls._cleanup)
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+    def setUp(self):
+        self.apiclient = self.testClient.getApiClient()
+        self.dbclient = self.testClient.getDbConnection()
+        self.account = Account.create(
+                                     self.apiclient,
+                                     self.services["account"],
+                                     admin=True,
+                                     domainid=self.domain.id
+                                     )
+        self.cleanup = [self.account]
+        return
+
+    def tearDown(self):
+        try:
+            self.debug("Cleaning up the resources")
+            #Clean up, terminate the created network offerings
+            #cleanup_resources(self.apiclient, self.cleanup)
+            interval = Configurations.list(
+                                    self.apiclient,
+                                    name='network.gc.interval'
+                                    )
+            wait = Configurations.list(
+                                    self.apiclient,
+                                    name='network.gc.wait'
+                                    )
+            # Sleep to ensure that all resources are deleted
+            time.sleep(int(interval[0].value) + int(wait[0].value))
+            self.debug("Cleanup complete!")
+        except Exception as e:
+            raise Exception("Warning: Exception during cleanup : %s" % e)
+        return
+
+
+    @attr(tags = ["advancedns"])
+    def test_network_vcs(self):
+        """Test Brocade Network and VM Creation
+        """
+
+
+        # Validate the following
+        # 1. Deploy the first VM using a network from the above created
+        #    Network offering.
+        # 2. Deploy another VM.
+        # 3. Delete The VMs and the Network
+
+        # Creating network using the network offering created
+        self.debug("Creating network with network offering: %s" %
+                                                    self.network_offering.id)
+        self.network = Network.create(
+                                    self.apiclient,
+                                    self.services["network"],
+                                    accountid=self.account.name,
+                                    domainid=self.account.domainid,
+                                    networkofferingid=self.network_offering.id,
+                                    zoneid=self.zone.id
+                                    )
+        self.debug("Created network with ID: %s" % self.network.id)
+
+        self.debug("Deploying VM in account: %s" % self.account.name)
+
+        # Spawn an instance in that network
+        virtual_machine_1 = VirtualMachine.create(
+                                  self.apiclient,
+                                  self.services["virtual_machine"],
+                                  accountid=self.account.name,
+                                  domainid=self.account.domainid,
+                                  serviceofferingid=self.service_offering.id,
+                                  networkids=[str(self.network.id)]
+                                  )
+        self.debug("Deployed VM in network: %s" % self.network.id)
+        list_vm_response = VirtualMachine.list(
+                                        self.apiclient,
+                                        id=virtual_machine_1.id
+                                        )
+
+        self.debug(
+                "Verify listVirtualMachines response for virtual machine: %s" \
+                % virtual_machine_1.id
+            )
+
+        self.assertEqual(
+                            isinstance(list_vm_response, list),
+                            True,
+                            "Check list response returns a valid list"
+                        )
+        vm_response = list_vm_response[0]
+
+        self.assertEqual(
+                            vm_response.state,
+                            "Running",
+                            "VM state should be running after deployment"
+                        )
+
+        self.debug("Deploying another VM in account: %s" %
+                                            self.account.name)
+
+        # Spawn an instance in that network
+        virtual_machine_2 = VirtualMachine.create(
+                                  self.apiclient,
+                                  self.services["virtual_machine"],
+                                  accountid=self.account.name,
+                                  domainid=self.account.domainid,
+                                  serviceofferingid=self.service_offering.id,
+                                  networkids=[str(self.network.id)]
+                                  )
+        self.debug("Deployed VM in network: %s" % self.network.id)
+        list_vm_response = VirtualMachine.list(
+                                        self.apiclient,
+                                        id=virtual_machine_2.id
+                                        )
+
+        self.debug(
+                "Verify listVirtualMachines response for virtual machine: %s" \
+                % virtual_machine_2.id
+            )
+
+        self.assertEqual(
+                            isinstance(list_vm_response, list),
+                            True,
+                            "Check list response returns a valid list"
+                        )
+        vm_response = list_vm_response[0]
+
+        self.assertEqual(
+                            vm_response.state,
+                            "Running",
+                            "VM state should be running after deployment"
+                        )
+
+        # Deleting a single VM
+        VirtualMachine.delete(virtual_machine_1, self.apiclient)
+        VirtualMachine.expung(virtual_machine_1, self.apiclient)
+
+
+        # Deleting a single VM
+        VirtualMachine.delete(virtual_machine_2, self.apiclient)
+        VirtualMachine.expung(virtual_machine_2, self.apiclient)
+
+
+        # Delete Network
+        Network.delete(self.network, self.apiclient)
+
+        return
+

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/tools/apidoc/gen_toc.py
----------------------------------------------------------------------
diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py
index bcc8417..1ad493d 100644
--- a/tools/apidoc/gen_toc.py
+++ b/tools/apidoc/gen_toc.py
@@ -132,6 +132,7 @@ known_categories = {
     'StaticRoute': 'VPC',
     'Tags': 'Resource tags',
     'NiciraNvpDevice': 'Nicira NVP',
+    'BrocadeVcsDevice': 'Brocade VCS',
     'BigSwitchVnsDevice': 'BigSwitch VNS',
 	'NuageVsp': 'Nuage VSP',
     'AutoScale': 'AutoScale',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index c84d0dd..beb082b 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -352,6 +352,7 @@ dictionary = {
 'label.add.new.tier': '<fmt:message key="label.add.new.tier" />',
 'label.add.NiciraNvp.device': '<fmt:message key="label.add.NiciraNvp.device" />',
 'label.add.NuageVsp.device': '<fmt:message key="label.add.NuageVsp.device" />',
+'label.add.BrocadeVcs.device': '<fmt:message key="label.add.BrocadeVcs.device" />',
 'label.add.pod': '<fmt:message key="label.add.pod" />',
 'label.add.port.forwarding.rule': '<fmt:message key="label.add.port.forwarding.rule" />',
 'label.add.primary.storage': '<fmt:message key="label.add.primary.storage" />',
@@ -509,6 +510,7 @@ dictionary = {
 'label.delete.NetScaler': '<fmt:message key="label.delete.NetScaler" />',
 'label.delete.NiciraNvp': '<fmt:message key="label.delete.NiciraNvp" />',
 'label.delete.NuageVsp': '<fmt:message key="label.delete.NuageVsp" />',
+'label.delete.BrocadeVcs': '<fmt:message key="label.delete.BrocadeVcs" />',
 'label.delete.project': '<fmt:message key="label.delete.project" />',
 'label.delete.SRX': '<fmt:message key="label.delete.SRX" />',
 'label.delete.PA': '<fmt:message key="label.delete.PA" />',
@@ -868,6 +870,7 @@ dictionary = {
 'label.nicira.controller.address': '<fmt:message key="label.nicira.controller.address" />',
 'label.nicira.l3gatewayserviceuuid': '<fmt:message key="label.nicira.l3gatewayserviceuuid" />',
 'label.nicira.transportzoneuuid': '<fmt:message key="label.nicira.transportzoneuuid" />',
+'label.brocade.vcs.address': '<fmt:message key="label.brocade.vcs.address" />',
 'label.nics': '<fmt:message key="label.nics" />',
 'label.no.actions': '<fmt:message key="label.no.actions" />',
 'label.no.alerts': '<fmt:message key="label.no.alerts" />',
@@ -1433,6 +1436,7 @@ dictionary = {
 'message.configuring.storage.traffic': '<fmt:message key="message.configuring.storage.traffic" />',
 'message.confirm.action.force.reconnect': '<fmt:message key="message.confirm.action.force.reconnect" />',
 'message.confirm.delete.F5': '<fmt:message key="message.confirm.delete.F5" />',
+'message.confirm.delete.BrocadeVcs': '<fmt:message key="message.confirm.delete.BrocadeVcs" />',
 'message.confirm.delete.NetScaler': '<fmt:message key="message.confirm.delete.NetScaler" />',
 'message.confirm.delete.NuageVsp': '<fmt:message key="message.confirm.delete.NuageVsp" />',
 'message.confirm.delete.SRX': '<fmt:message key="message.confirm.delete.SRX" />',
@@ -1738,6 +1742,8 @@ dictionary = {
 'label.palo.alto.details': '<fmt:message key="label.palo.alto.details" />',
 'label.added.nicira.nvp.controller': '<fmt:message key="label.added.nicira.nvp.controller" />',
 'label.nicira.nvp.details': '<fmt:message key="label.nicira.nvp.details" />',
+'label.added.brocade.vcs.switch': '<fmt:message key="label.added.brocade.vcs.switch" />',
+'label.brocade.vcs.details': '<fmt:message key="label.brocade.vcs.details" />',
 'label.added.new.bigswitch.vns.controller': '<fmt:message key="label.added.new.bigswitch.vns.controller" />',
 'label.bigswitch.vns.details': '<fmt:message key="label.bigswitch.vns.details" />',
 'label.dedicate': '<fmt:message key="label.dedicate" />',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 502007f..4e0d78a 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5808,6 +5808,206 @@
                             }
                         }
                     },
+					// Brocade Vcs provider detail view
+                    brocadeVcs: {
+                        type: 'detailView',
+                        id: 'brocadeVcsProvider',
+                        label: 'label.brocadeVcs',
+                        viewAll: {
+                            label: 'label.devices',
+                            path: '_zone.brocadeVcsDevices'
+                        },
+                        tabs: {
+                            details: {
+                                title: 'label.details',
+                                fields:[ {
+                                    name: {
+                                        label: 'label.name'
+                                    }
+                                },
+                                {
+                                    state: {
+                                        label: 'label.state'
+                                    }
+                                }],
+                                dataProvider: function (args) {
+                                    refreshNspData("BrocadeVcs");
+                                    var providerObj;
+                                    $(nspHardcodingArray).each(function () {
+                                        if (this.id == "brocadeVcs") {
+                                            providerObj = this;
+                                            return false; //break each loop
+                                        }
+                                    });
+                                    args.response.success({
+                                        data: providerObj,
+                                        actionFilter: networkProviderActionFilter('brocadeVcs')
+                                    });
+                                }
+                            }
+                        },
+                        actions: {
+                            add: {
+                                label: 'label.add.BrocadeVcs.device',
+                                createForm: {
+                                    title: 'label.add.BrocadeVcs.device',
+                                    preFilter: function (args) {
+                                    },
+                                    // TODO What is this?
+                                    fields: {
+                                        host: {
+                                            label: 'label.ip.address'
+                                        },
+                                        username: {
+                                            label: 'label.username'
+                                        },
+                                        password: {
+                                            label: 'label.password',
+                                            isPassword: true
+                                        }
+                                    }
+                                },
+                                action: function (args) {
+                                    if (nspMap[ "brocadeVcs"] == null) {
+                                        $.ajax({
+                                            url: createURL("addNetworkServiceProvider&name=BrocadeVcs&physicalnetworkid=" + selectedPhysicalNetworkObj.id),
+                                            dataType: "json",
+                                            async: true,
+                                            success: function (json) {
+                                                var jobId = json.addnetworkserviceproviderresponse.jobid;
+                                                var addBrocadeVcsProviderIntervalID = setInterval(function () {
+                                                    $.ajax({
+                                                        url: createURL("queryAsyncJobResult&jobId=" + jobId),
+                                                        dataType: "json",
+                                                        success: function (json) {
+                                                            var result = json.queryasyncjobresultresponse;
+                                                            if (result.jobstatus == 0) {
+                                                                return; //Job has not completed
+                                                            } else {
+                                                                clearInterval(addBrocadeVcsProviderIntervalID);
+                                                                if (result.jobstatus == 1) {
+                                                                    nspMap[ "brocadeVcs"] = json.queryasyncjobresultresponse.jobresult.networkserviceprovider;
+                                                                    addBrocadeVcsDevice(args, selectedPhysicalNetworkObj, "addBrocadeVcsDevice", "addbrocadevcsdeviceresponse", "brocadevcsdevice")
+                                                                } else if (result.jobstatus == 2) {
+                                                                    alert("addNetworkServiceProvider&name=BrocadeVcs failed. Error: " + _s(result.jobresult.errortext));
+                                                                }
+                                                            }
+                                                        },
+                                                        error: function (XMLHttpResponse) {
+                                                            var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                                                            alert("addNetworkServiceProvider&name=BrocadeVcs failed. Error: " + errorMsg);
+                                                        }
+                                                    });
+                                                },
+                                                g_queryAsyncJobResultInterval);
+                                            }
+                                        });
+                                    } else {
+                                        addBrocadeVcsDevice(args, selectedPhysicalNetworkObj, "addBrocadeVcsDevice", "addbrocadevcsdeviceresponse", "brocadevcsdevice")
+                                    }
+                                },
+                                messages: {
+                                    notification: function (args) {
+                                        return 'label.add.BrocadeVcs.device';
+                                    }
+                                },
+                                notification: {
+                                    poll: pollAsyncJobResult
+                                }
+                            },
+                            enable: {
+                                label: 'label.enable.provider',
+                                action: function (args) {
+                                    $.ajax({
+                                        url: createURL("updateNetworkServiceProvider&id=" + nspMap[ "brocadeVcs"].id + "&state=Enabled"),
+                                        dataType: "json",
+                                        success: function (json) {
+                                            var jid = json.updatenetworkserviceproviderresponse.jobid;
+                                            args.response.success({
+                                                _custom: {
+                                                    jobId: jid,
+                                                    getUpdatedItem: function (json) {
+                                                        $(window).trigger('cloudStack.fullRefresh');
+                                                    }
+                                                }
+                                            });
+                                        }
+                                    });
+                                },
+                                messages: {
+                                    confirm: function (args) {
+                                        return 'message.confirm.enable.provider';
+                                    },
+                                    notification: function () {
+                                        return 'label.enable.provider';
+                                    }
+                                },
+                                notification: {
+                                    poll: pollAsyncJobResult
+                                }
+                            },
+                            disable: {
+                                label: 'label.disable.provider',
+                                action: function (args) {
+                                    $.ajax({
+                                        url: createURL("updateNetworkServiceProvider&id=" + nspMap[ "brocadeVcs"].id + "&state=Disabled"),
+                                        dataType: "json",
+                                        success: function (json) {
+                                            var jid = json.updatenetworkserviceproviderresponse.jobid;
+                                            args.response.success({
+                                                _custom: {
+                                                    jobId: jid,
+                                                    getUpdatedItem: function (json) {
+                                                        $(window).trigger('cloudStack.fullRefresh');
+                                                    }
+                                                }
+                                            });
+                                        }
+                                    });
+                                },
+                                messages: {
+                                    confirm: function (args) {
+                                        return 'message.confirm.disable.provider';
+                                    },
+                                    notification: function () {
+                                        return 'label.disable.provider';
+                                    }
+                                },
+                                notification: {
+                                    poll: pollAsyncJobResult
+                                }
+                            },
+                            destroy: {
+                                label: 'label.shutdown.provider',
+                                action: function (args) {
+                                    $.ajax({
+                                        url: createURL("deleteNetworkServiceProvider&id=" + nspMap[ "brocadeVcs"].id),
+                                        dataType: "json",
+                                        success: function (json) {
+                                            var jid = json.deletenetworkserviceproviderresponse.jobid;
+                                            args.response.success({
+                                                _custom: {
+                                                    jobId: jid
+                                                }
+                                            });
+                                            $(window).trigger('cloudStack.fullRefresh');
+                                        }
+                                    });
+                                },
+                                messages: {
+                                    confirm: function (args) {
+                                        return 'message.confirm.shutdown.provider';
+                                    },
+                                    notification: function (args) {
+                                        return 'label.shutdown.provider';
+                                    }
+                                },
+                                notification: {
+                                    poll: pollAsyncJobResult
+                                }
+                            }
+                        }
+                    },
                     // BigSwitch Vns provider detail view
                     bigswitchVns: {
                         type: 'detailView',
@@ -12040,6 +12240,166 @@
                     }
                 }
             },
+			// BrocadeVcs devices listView
+            brocadeVcsDevices: {
+                id: 'brocadeVcsDevices',
+                title: 'label.devices',
+                listView: {
+                    id: 'brocadeVcsDevices',
+                    fields: {
+                        hostname: {
+                            label: 'label.brocade.vcs.address'
+                        }
+                    },
+                    actions: {
+                        add: {
+                            label: 'label.add.BrocadeVcs.device',
+                            createForm: {
+                                title: 'label.add.BrocadeVcs.device',
+                                preFilter: function (args) {
+                                },
+                                // TODO What is this?
+                                fields: {
+                                    host: {
+                                        label: 'label.ip.address'
+                                    },
+                                    username: {
+                                        label: 'label.username'
+                                    },
+                                    password: {
+                                        label: 'label.password',
+                                        isPassword: true
+                                    }
+                                }
+                            },
+                            action: function (args) {
+                                if (nspMap[ "brocadeVcs"] == null) {
+                                    $.ajax({
+                                        url: createURL("addNetworkServiceProvider&name=BrocadeVcs&physicalnetworkid=" + selectedPhysicalNetworkObj.id),
+                                        dataType: "json",
+                                        async: true,
+                                        success: function (json) {
+                                            var jobId = json.addnetworkserviceproviderresponse.jobid;
+                                            var addBrocadeVcsProviderIntervalID = setInterval(function () {
+                                                $.ajax({
+                                                    url: createURL("queryAsyncJobResult&jobId=" + jobId),
+                                                    dataType: "json",
+                                                    success: function (json) {
+                                                        var result = json.queryasyncjobresultresponse;
+                                                        if (result.jobstatus == 0) {
+                                                            return; // Job has not completed
+                                                        } else {
+                                                            clearInterval(addBrocadeVcsProviderIntervalID);
+                                                            if (result.jobstatus == 1) {
+                                                                nspMap[ "brocadeVcs"] = json.queryasyncjobresultresponse.jobresult.networkserviceprovider;
+                                                                addBrocadeVcsDevice(args, selectedPhysicalNetworkObj, "addBrocadeVcsDevice", "addbrocadevcsdeviceresponse", "brocadevcsdevice")
+                                                            } else if (result.jobstatus == 2) {
+                                                                alert("addNetworkServiceProvider&name=BrocadeVcs failed. Error: " + _s(result.jobresult.errortext));
+                                                            }
+                                                        }
+                                                    },
+                                                    error: function (XMLHttpResponse) {
+                                                        var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
+                                                        alert("addNetworkServiceProvider&name=BrocadeVcs failed. Error: " + errorMsg);
+                                                    }
+                                                });
+                                            },
+                                            g_queryAsyncJobResultInterval);
+                                        }
+                                    });
+                                } else {
+                                    addBrocadeVcsDevice(args, selectedPhysicalNetworkObj, "addBrocadeVcsDevice", "addbrocadevcsdeviceresponse", "brocadevcsdevice")
+                                }
+                            },
+                            messages: {
+                                notification: function (args) {
+                                    return 'label.added.brocade.vcs.switch';
+                                }
+                            },
+                            notification: {
+                                poll: pollAsyncJobResult
+                            }
+                        }
+                    },
+                    dataProvider: function (args) {
+                        $.ajax({
+                            url: createURL("listBrocadeVcsDevices&physicalnetworkid=" + selectedPhysicalNetworkObj.id),
+                            data: {
+                                page: args.page,
+                                pageSize: pageSize
+                            },
+                            dataType: "json",
+                            async: false,
+                            success: function (json) {
+                                var items = json.listbrocadevcsdeviceresponse.brocadevcsdevice;
+                                args.response.success({
+                                    data: items
+                                });
+                            }
+                        });
+                    },
+                    detailView: {
+                        name: 'label.brocade.vcs.details',
+                        actions: {
+                            'remove': {
+                                label: 'label.delete.BrocadeVcs',
+                                messages: {
+                                    confirm: function (args) {
+                                        return 'message.confirm.delete.BrocadeVcs';
+                                    },
+                                    notification: function (args) {
+                                        return 'label.delete.BrocadeVcs';
+                                    }
+                                },
+                                action: function (args) {
+                                    $.ajax({
+                                        url: createURL("deleteBrocadeVcsDevice&vcsdeviceid=" + args.context.brocadeVcsDevices[0].vcsdeviceid),
+                                        dataType: "json",
+                                        async: true,
+                                        success: function (json) {
+                                            var jid = json.deletebrocadevcsdeviceresponse.jobid;
+                                            args.response.success({
+                                                _custom: {
+                                                    jobId: jid
+                                                }
+                                            });
+                                        }
+                                    });
+                                },
+                                notification: {
+                                    poll: pollAsyncJobResult
+                                }
+                            }
+                        },
+                        tabs: {
+                            details: {
+                                title: 'label.details',
+                                fields:[ {
+                                    vcsdeviceid: {
+                                        label: 'label.id'
+                                    },
+                                    hostname: {
+                                        label: 'label.ip.address'
+                                    }
+                                }],
+                                dataProvider: function (args) {
+                                    $.ajax({
+                                        url: createURL("listBrocadeVcsDevices&vcsdeviceid=" + args.context.brocadeVcsDevices[0].vcsdeviceid),
+                                        dataType: "json",
+                                        async: true,
+                                        success: function (json) {
+                                            var item = json.listbrocadevcsdeviceresponse.brocadevcsdevice[0];
+                                            args.response.success({
+                                                data: item
+                                            });
+                                        }
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
+            },
             bigswitchVnsDevices: {
                 id: 'bigswitchVnsDevices',
                 title: 'label.devices',
@@ -19204,7 +19564,34 @@
             }
         });
     }
-    
+
+	function addBrocadeVcsDevice(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) {
+        var array1 =[];
+        array1.push("&physicalnetworkid=" + physicalNetworkObj.id);
+        array1.push("&username=" + todb(args.data.username));
+        array1.push("&password=" + todb(args.data.password));
+        array1.push("&hostname=" + todb(args.data.host));
+
+        $.ajax({
+            url: createURL(apiCmd + array1.join("")),
+            dataType: "json",
+            type: "POST",
+            success: function (json) {
+                var jid = json[apiCmdRes].jobid;
+                args.response.success({
+                    _custom: {
+                        jobId: jid,
+                        getUpdatedItem: function (json) {
+                            var item = json.queryasyncjobresultresponse.jobresult[apiCmdObj];
+
+                            return item;
+                        }
+                    }
+                });
+            }
+        });
+    }
+
     function addOpenDaylightController(args, physicalNetworkObj, apiCmd, apiCmdRes, apiCmdObj) {
         var array1 =[];
         array1.push("&physicalnetworkid=" + physicalNetworkObj.id);
@@ -19956,6 +20343,9 @@
                             case "NiciraNvp":
                             nspMap[ "niciraNvp"] = items[i];
                             break;
+							case "BrocadeVcs":
+                            nspMap[ "brocadeVcs"] = items[i];
+                            break;
                             case "BigSwitchVns":
                             nspMap[ "bigswitchVns"] = items[i];
                             break;
@@ -19989,6 +20379,11 @@
             name: 'Nicira Nvp',
             state: nspMap.niciraNvp ? nspMap.niciraNvp.state: 'Disabled'
         },
+		{
+            id: 'brocadeVcs',
+            name: 'Brocade',
+            state: nspMap.brocadeVcs ? nspMap.brocadeVcs.state: 'Disabled'
+        },
         {
             id: 'bigswitchVns',
             name: 'BigSwitch Vns',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/628d8e66/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 645c2b1..f3a1aae 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -729,7 +729,10 @@
                             }).html('L3VPN'),
 		                    $('<option>').attr({
                                 value: 'VSP'
-                            }).html('VSP')
+                            }).html('VSP'),
+                            $('<option>').attr({
+                                value: 'VCS'
+                            }).html('VCS')
                         )
                     )
                 );