X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=itm%2Fitm-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Fitm%2Fconfighelpers%2FItmTepAddWorker.java;h=ed6282d3ea40862023b34d2b6ed62d781f4a0bcb;hb=HEAD;hp=e6dc9987cb280432e6aada9f121ed96d3dcc5e12;hpb=5c227c8ca7856fd48c4381491c086516420bf08a;p=vpnservice.git diff --git a/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmTepAddWorker.java b/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmTepAddWorker.java index e6dc9987..ed6282d3 100644 --- a/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmTepAddWorker.java +++ b/itm/itm-impl/src/main/java/org/opendaylight/vpnservice/itm/confighelpers/ItmTepAddWorker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. + * Copyright (c) 2015, 2016 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -15,6 +15,8 @@ import com.google.common.util.concurrent.ListenableFuture; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.vpnservice.itm.impl.ItmUtils; +import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.IdManagerService; +import org.opendaylight.vpnservice.mdsalutil.interfaces.IMdsalApiManager; import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.itm.op.rev150701.dpn.endpoints.DPNTEPsInfo; import org.slf4j.LoggerFactory; import org.slf4j.Logger; @@ -22,13 +24,20 @@ import org.slf4j.Logger; public class ItmTepAddWorker implements Callable>> { private static final Logger logger = LoggerFactory.getLogger(ItmTepAddWorker.class ) ; private DataBroker dataBroker; + private IdManagerService idManagerService; private List meshedDpnList; private List cfgdDpnList ; + private IMdsalApiManager mdsalManager; + private List cfgdHwVteps; - public ItmTepAddWorker( List cfgdDpnList, DataBroker broker) { + public ItmTepAddWorker( List cfgdDpnList, List hwVtepList, DataBroker broker, IdManagerService idManagerService, IMdsalApiManager mdsalManager) { this.cfgdDpnList = cfgdDpnList ; this.dataBroker = broker ; + this.idManagerService = idManagerService; + this.mdsalManager = mdsalManager; + this.cfgdHwVteps = hwVtepList; logger.trace("ItmTepAddWorker initialized with DpnList {}",cfgdDpnList ); + logger.trace("ItmTepAddWorker initialized with hwvteplist {}",hwVtepList); } @Override @@ -36,9 +45,11 @@ public class ItmTepAddWorker implements Callable>> { List> futures = new ArrayList<>() ; this.meshedDpnList = ItmUtils.getTunnelMeshInfo(dataBroker) ; logger.debug("Invoking Internal Tunnel build method with Configured DpnList {} ; Meshed DpnList {} ",cfgdDpnList, meshedDpnList ); - futures.addAll( ItmInternalTunnelAddWorker.build_all_tunnels(dataBroker, cfgdDpnList, meshedDpnList) ) ; + futures.addAll( ItmInternalTunnelAddWorker.build_all_tunnels(dataBroker, idManagerService,mdsalManager, cfgdDpnList, meshedDpnList) ) ; // IF EXTERNAL TUNNELS NEEDS TO BE BUILT, DO IT HERE. IT COULD BE TO DC GATEWAY OR TOR SWITCH //futures.addAll(ItmExternalTunnelAddWorker.buildTunnelsToExternalEndPoint(dataBroker,meshedDpnList, extIp) ; + logger.debug("invoking build hwVtepTunnels with hwVteplist {}", cfgdHwVteps ); + futures.addAll(ItmExternalTunnelAddWorker.buildHwVtepsTunnels(dataBroker, idManagerService,cfgdDpnList,cfgdHwVteps)); return futures ; }