import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
-import java.util.stream.Stream;
import org.junit.Assert;
import org.junit.Before;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.groupbasedpolicy.renderer.vpp.api.BridgeDomainManager;
+import org.opendaylight.groupbasedpolicy.renderer.vpp.DtoFactory;
import org.opendaylight.groupbasedpolicy.renderer.vpp.event.RendererPolicyConfEvent;
import org.opendaylight.groupbasedpolicy.renderer.vpp.event.VppEndpointConfEvent;
+import org.opendaylight.groupbasedpolicy.renderer.vpp.iface.AclManager;
import org.opendaylight.groupbasedpolicy.renderer.vpp.iface.InterfaceManager;
import org.opendaylight.groupbasedpolicy.renderer.vpp.iface.VppEndpointLocationProvider;
-import org.opendaylight.groupbasedpolicy.renderer.vpp.iface.VppPathMapper;
+import org.opendaylight.groupbasedpolicy.renderer.vpp.nat.NatManager;
+import org.opendaylight.groupbasedpolicy.renderer.vpp.routing.RoutingManager;
import org.opendaylight.groupbasedpolicy.renderer.vpp.util.KeyFactory;
import org.opendaylight.groupbasedpolicy.renderer.vpp.util.MountedDataBrokerProvider;
import org.opendaylight.groupbasedpolicy.test.CustomDataBrokerTest;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.common.endpoint.fields.NetworkContainment;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.common.endpoint.fields.NetworkContainmentBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.common.endpoint.fields.network.containment.containment.ForwardingContextContainmentBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.AbsoluteLocation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.AbsoluteLocationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.base_endpoint.rev160427.has.absolute.location.absolute.location.location.type.ExternalLocationCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ContextId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.ContractId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.RuleName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SubjectName;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint_location_provider.rev160419.LocationProviders;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint_location_provider.rev160419.location.providers.LocationProvider;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint_location_provider.rev160419.location.providers.location.provider.ProviderAddressEndpointLocation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.l2_l3.rev160427.L2FloodDomain;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.AddressType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.ContextType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.EndpointPolicyParticipation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.has.rule.group.with.renderer.endpoint.participation.RuleGroupWithRendererEndpointParticipation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.has.rule.group.with.renderer.endpoint.participation.RuleGroupWithRendererEndpointParticipationBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicy;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicyBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.ConfigurationBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.Endpoints;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.EndpointsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.RendererEndpointsBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.RuleGroupsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.endpoints.AddressEndpointWithLocation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.endpoints.AddressEndpointWithLocationBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.endpoints.AddressEndpointWithLocationKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.endpoints.RendererEndpoint;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.endpoints.RendererEndpointBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.endpoints.renderer.endpoint.PeerEndpointWithPolicy;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.endpoints.renderer.endpoint.PeerEndpointWithPolicyBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.rule.groups.RuleGroup;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.rule.groups.RuleGroupBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.resolved.policy.rev150828.has.resolved.rules.ResolvedRuleBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.Config;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425._interface.attributes._interface.type.choice.VhostUserCaseBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.bridge.domain.base.attributes.PhysicalLocationRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.VppEndpoint;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.VppEndpointBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.VppEndpointKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.bridge.domain.PhysicalLocationRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.vpp_renderer.rev160425.config.vpp.endpoint._interface.type.choice.VhostUserCaseBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VppInterfaceAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.VxlanVni;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.interfaces._interface.L2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.Interconnection;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.l2.base.attributes.interconnection.BridgeBased;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev150105.vpp.BridgeDomains;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.VppInterfaceAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.VxlanVni;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.interfaces._interface.L2;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.l2.base.attributes.Interconnection;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.l2.base.attributes.interconnection.BridgeBased;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev170315.BridgeDomains;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vbridge.topology.rev160129.TopologyVbridgeAugment;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vbridge.tunnel.vxlan.rev160429.TunnelTypeVxlan;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
-import com.google.common.util.concurrent.MoreExecutors;
@RunWith(MockitoJUnitRunner.class)
public class VppRendererPolicyManagerTest extends CustomDataBrokerTest {
private static final InstanceIdentifier<RendererPolicy> RENDERER_POLICY_IID =
IidFactory.rendererIid(VppRenderer.NAME).child(RendererPolicy.class);
- private static final ContextId CTX_ID = new ContextId("ctx");
- private static final ContextId L2FD_CTX = new ContextId("l2fd");
- private final static TopologyKey TOPO_KEY = new TopologyKey(new TopologyId("topology-netconf"));
- private final static InstanceIdentifier<Node> VPP_NODE_1_IID = InstanceIdentifier.builder(NetworkTopology.class)
- .child(Topology.class, TOPO_KEY)
- .child(Node.class, new NodeKey(new NodeId("node1")))
- .build();
- private final static InstanceIdentifier<Node> VPP_NODE_2_IID = InstanceIdentifier.builder(NetworkTopology.class)
- .child(Topology.class, TOPO_KEY)
- .child(Node.class, new NodeKey(new NodeId("node2")))
- .build();
- private static final ContractId CONTRACT_ID = new ContractId("contract");
- private static final TenantId TENANT_ID = new TenantId("tenant");
- private static final SubjectName SUBJECT_NAME = new SubjectName("subject");
- private static final RuleName RULE_NAME = new RuleName("rule");
- private static final RuleGroupWithRendererEndpointParticipation RULE_GROUP_WITH_CONSUMER =
- new RuleGroupWithRendererEndpointParticipationBuilder().setContractId(CONTRACT_ID)
- .setTenantId(TENANT_ID)
- .setSubjectName(SUBJECT_NAME)
- .setRendererEndpointParticipation(EndpointPolicyParticipation.CONSUMER)
- .build();
- private static final RuleGroupWithRendererEndpointParticipation RULE_GROUP_WITH_PROVIDER =
- new RuleGroupWithRendererEndpointParticipationBuilder().setContractId(CONTRACT_ID)
- .setTenantId(TENANT_ID)
- .setSubjectName(SUBJECT_NAME)
- .setRendererEndpointParticipation(EndpointPolicyParticipation.PROVIDER)
- .build();
- private static final RuleGroup RULE_GROUP = new RuleGroupBuilder().setContractId(CONTRACT_ID)
- .setTenantId(TENANT_ID)
- .setSubjectName(SUBJECT_NAME)
- .setResolvedRule(Arrays.asList(new ResolvedRuleBuilder().setName(RULE_NAME).build()))
- .build();
private final static String SOCKET = "socket";
private MountedDataBrokerProvider mountedDataProviderMock;
private DataBroker mountPointDataBroker;
private DataBroker dataBroker;
- private BridgeDomainManager bdManager;
+ private BridgeDomainManagerImpl bdManager;
private InterfaceManager ifaceManager;
+ private AclManager aclManager;
private ForwardingManager fwManager;
+ private NatManager natManager;
+ private RoutingManager routingManager;
private VppRendererPolicyManager vppRendererPolicyManager;
@Override
@Before
public void init() throws Exception {
- ForwardingManager.WAIT_FOR_BD_CREATION = 2;
mountedDataProviderMock = Mockito.mock(MountedDataBrokerProvider.class);
mountPointDataBroker = getDataBroker();
setup(); // initialize new data broker for ODL data store
dataBroker = getDataBroker();
Mockito.when(mountedDataProviderMock.getDataBrokerForMountPoint(Mockito.any(InstanceIdentifier.class)))
.thenReturn(Optional.of(mountPointDataBroker));
- ifaceManager =
- new InterfaceManager(mountedDataProviderMock, dataBroker, MoreExecutors.newDirectExecutorService());
+ ifaceManager = new InterfaceManager(mountedDataProviderMock, dataBroker);
+ aclManager = new AclManager(mountedDataProviderMock);
+ natManager = new NatManager(dataBroker, mountedDataProviderMock);
+ routingManager = new RoutingManager(dataBroker, mountedDataProviderMock);
bdManager = new BridgeDomainManagerImpl(mountPointDataBroker);
- fwManager = new ForwardingManager(ifaceManager, bdManager, dataBroker);
- vppRendererPolicyManager = new VppRendererPolicyManager(fwManager, dataBroker);
+ fwManager = new ForwardingManager(ifaceManager, aclManager, natManager, routingManager, bdManager, dataBroker);
+ vppRendererPolicyManager = new VppRendererPolicyManager(fwManager, aclManager, dataBroker);
+ fwManager.setTimer((byte) 1);
}
@Test
public void testRendererPolicyChanged_created_oneEpPerEpg() throws Exception {
String clientIp = "1.1.1.1";
String clientIfaceName = "client1";
- AbsoluteLocation clientLocation = absoluteLocation(VPP_NODE_1_IID, null, clientIfaceName);
- AddressEndpointWithLocation clientEp = createEndpoint(clientIp, L2FD_CTX.getValue(), clientLocation);
+ AbsoluteLocation clientLocation = DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, null, clientIfaceName);
+ AddressEndpointWithLocation clientEp =
+ DtoFactory.createEndpoint(clientIp, DtoFactory.L2FD_CTX.getValue(), clientLocation);
String webIp = "2.2.2.2";
String webIfaceName = "web1";
- AbsoluteLocation webLocation = absoluteLocation(VPP_NODE_1_IID, null, webIfaceName);
- AddressEndpointWithLocation webEp = createEndpoint(webIp, L2FD_CTX.getValue(), webLocation);
+ AbsoluteLocation webLocation = DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, null, webIfaceName);
+ AddressEndpointWithLocation webEp =
+ DtoFactory.createEndpoint(webIp, DtoFactory.L2FD_CTX.getValue(), webLocation);
storeVppEndpoint(clientEp.getKey(), clientIfaceName, createVppEndpointIid(clientEp.getKey()));
storeVppEndpoint(webEp.getKey(), webIfaceName, createVppEndpointIid(webEp.getKey()));
- Configuration configuration = createConfiguration(Arrays.asList(clientEp), Arrays.asList(webEp));
+ Configuration configuration = DtoFactory.createConfiguration(Arrays.asList(clientEp), Arrays.asList(webEp));
RendererPolicy rendererPolicy =
new RendererPolicyBuilder().setVersion(1L).setConfiguration(configuration).build();
RendererPolicyConfEvent event = new RendererPolicyConfEvent(RENDERER_POLICY_IID, null, rendererPolicy);
// assert state on data store behind mount point
Interface clientIface = readAndAssertInterface(clientIfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), clientIface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), clientIface);
Interface webIface = readAndAssertInterface(webIfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), webIface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), webIface);
// assert state on ODL data store
ReadOnlyTransaction rTx = dataBroker.newReadOnlyTransaction();
Optional<LocationProvider> optLocationProvider = rTx.read(LogicalDatastoreType.CONFIGURATION,
Assert.assertNotNull(epLocs);
Assert.assertEquals(2, epLocs.size());
assertProviderAddressEndpointLocation(clientEp.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), clientIfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, DtoFactory.L2FD_CTX.getValue(), clientIfaceName),
+ epLocs);
assertProviderAddressEndpointLocation(webEp.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), webIfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, DtoFactory.L2FD_CTX.getValue(), webIfaceName),
+ epLocs);
}
@Test
public void testRendererPolicyChanged_update() throws Exception {
String client1IfaceName = "client1";
- AbsoluteLocation client1LocationNodeNull = absoluteLocation(VPP_NODE_1_IID, null, client1IfaceName);
+ AbsoluteLocation client1LocationNodeNull =
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, null, client1IfaceName);
AddressEndpointWithLocation client1Ep =
- createEndpoint("10.0.0.1", L2FD_CTX.getValue(), client1LocationNodeNull);
+ DtoFactory.createEndpoint("10.0.0.1", DtoFactory.L2FD_CTX.getValue(), client1LocationNodeNull);
String web1IfaceName = "web1";
- AbsoluteLocation web1LocationNodeNull = absoluteLocation(VPP_NODE_2_IID, null, web1IfaceName);
- AddressEndpointWithLocation web1Ep = createEndpoint("20.0.0.1", L2FD_CTX.getValue(), web1LocationNodeNull);
+ AbsoluteLocation web1LocationNodeNull =
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, null, web1IfaceName);
+ AddressEndpointWithLocation web1Ep =
+ DtoFactory.createEndpoint("20.0.0.1", DtoFactory.L2FD_CTX.getValue(), web1LocationNodeNull);
String client2IfaceName = "client2";
- AbsoluteLocation client2LocationNodeNull = absoluteLocation(VPP_NODE_1_IID, null, client2IfaceName);
+ AbsoluteLocation client2LocationNodeNull =
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID, null, client2IfaceName);
AddressEndpointWithLocation client2Ep =
- createEndpoint("10.0.0.2", L2FD_CTX.getValue(), client2LocationNodeNull);
+ DtoFactory.createEndpoint("10.0.0.2", DtoFactory.L2FD_CTX.getValue(), client2LocationNodeNull);
String web2IfaceName = "web2";
- AbsoluteLocation web2LocationNodeNull = absoluteLocation(VPP_NODE_2_IID, null, web2IfaceName);
- AddressEndpointWithLocation web2Ep = createEndpoint("20.0.0.2", L2FD_CTX.getValue(), web2LocationNodeNull);
+ AbsoluteLocation web2LocationNodeNull =
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, null, web2IfaceName);
+ AddressEndpointWithLocation web2Ep =
+ DtoFactory.createEndpoint("20.0.0.2", DtoFactory.L2FD_CTX.getValue(), web2LocationNodeNull);
storeVppEndpoint(client1Ep.getKey(), client1IfaceName, createVppEndpointIid(client1Ep.getKey()));
storeVppEndpoint(web1Ep.getKey(), web1IfaceName, createVppEndpointIid(web1Ep.getKey()));
storeVppEndpoint(web2Ep.getKey(), web2IfaceName, createVppEndpointIid(web2Ep.getKey()));
Configuration configuration =
- createConfiguration(Arrays.asList(client1Ep, client2Ep), Arrays.asList(web1Ep, web2Ep));
+ DtoFactory.createConfiguration(Arrays.asList(client1Ep, client2Ep), Arrays.asList(web1Ep, web2Ep));
RendererPolicy rendererPolicy =
new RendererPolicyBuilder().setVersion(1L).setConfiguration(configuration).build();
RendererPolicyConfEvent event = new RendererPolicyConfEvent(RENDERER_POLICY_IID, null, rendererPolicy);
// assert state on data store behind mount point ######################################
Interface client1Iface = readAndAssertInterface(client1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client1Iface);
Interface web1Iface = readAndAssertInterface(web1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web1Iface);
Interface client2Iface = readAndAssertInterface(client2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client2Iface);
Interface web2Iface = readAndAssertInterface(web2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web2Iface);
// assert state on ODL data store
ReadOnlyTransaction rTx = dataBroker.newReadOnlyTransaction();
Optional<LocationProvider> optLocationProvider = rTx.read(LogicalDatastoreType.CONFIGURATION,
List<ProviderAddressEndpointLocation> epLocs = optLocationProvider.get().getProviderAddressEndpointLocation();
Assert.assertNotNull(epLocs);
Assert.assertEquals(4, epLocs.size());
- assertProviderAddressEndpointLocation(client1Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client1IfaceName), epLocs);
+ assertProviderAddressEndpointLocation(client1Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client1IfaceName), epLocs);
assertProviderAddressEndpointLocation(web1Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web1IfaceName), epLocs);
- assertProviderAddressEndpointLocation(client2Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web1IfaceName),
+ epLocs);
+ assertProviderAddressEndpointLocation(client2Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client2IfaceName), epLocs);
assertProviderAddressEndpointLocation(web2Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web2IfaceName),
+ epLocs);
// #####################################################################################
- AbsoluteLocation client1Location =
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client1IfaceName);
+ AbsoluteLocation client1Location = DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client1IfaceName);
AbsoluteLocation web1Location =
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web1IfaceName);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web1IfaceName);
AbsoluteLocation web2Location =
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web2IfaceName);
- configuration = createConfiguration(
- Arrays.asList(
- new AddressEndpointWithLocationBuilder(client1Ep).setAbsoluteLocation(client1Location).build(),
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web2IfaceName);
+ configuration = DtoFactory.createConfiguration(
+ Arrays.asList(new AddressEndpointWithLocationBuilder(client1Ep).setAbsoluteLocation(client1Location)
+ .build(),
new AddressEndpointWithLocationBuilder(client2Ep).setAbsoluteLocation(client2LocationNodeNull)
.build()),
Arrays.asList(new AddressEndpointWithLocationBuilder(web1Ep).setAbsoluteLocation(web1Location).build(),
// assert state on data store behind mount point ######################################
client1Iface = readAndAssertInterface(client1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client1Iface);
web1Iface = readAndAssertInterface(web1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web1Iface);
client2Iface = readAndAssertInterface(client2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client2Iface);
web2Iface = readAndAssertInterface(web2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web2Iface);
// assert state on ODL data store
rTx = dataBroker.newReadOnlyTransaction();
optLocationProvider = rTx.read(LogicalDatastoreType.CONFIGURATION,
epLocs = optLocationProvider.get().getProviderAddressEndpointLocation();
Assert.assertNotNull(epLocs);
Assert.assertEquals(4, epLocs.size());
- assertProviderAddressEndpointLocation(client1Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client1IfaceName), epLocs);
+ assertProviderAddressEndpointLocation(client1Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client1IfaceName), epLocs);
assertProviderAddressEndpointLocation(web1Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web1IfaceName), epLocs);
- assertProviderAddressEndpointLocation(client2Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web1IfaceName),
+ epLocs);
+ assertProviderAddressEndpointLocation(client2Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client2IfaceName), epLocs);
assertProviderAddressEndpointLocation(web2Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web2IfaceName),
+ epLocs);
// #####################################################################################
- AbsoluteLocation client2Location =
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client2IfaceName);
- configuration = createConfiguration(
+ AbsoluteLocation client2Location = DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client2IfaceName);
+ configuration = DtoFactory.createConfiguration(
Arrays.asList(new AddressEndpointWithLocationBuilder(client1Ep).setAbsoluteLocation(client1Location)
.build(),
new AddressEndpointWithLocationBuilder(client2Ep).setAbsoluteLocation(client2Location).build()),
// assert state on data store behind mount point ######################################
client1Iface = readAndAssertInterface(client1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client1Iface);
web1Iface = readAndAssertInterface(web1IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web1Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web1Iface);
client2Iface = readAndAssertInterface(client2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), client2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), client2Iface);
web2Iface = readAndAssertInterface(web2IfaceName);
- assertBridgeDomainOnInterface(L2FD_CTX.getValue(), web2Iface);
+ assertBridgeDomainOnInterface(DtoFactory.L2FD_CTX.getValue(), web2Iface);
// assert state on ODL data store
rTx = dataBroker.newReadOnlyTransaction();
optLocationProvider = rTx.read(LogicalDatastoreType.CONFIGURATION,
epLocs = optLocationProvider.get().getProviderAddressEndpointLocation();
Assert.assertNotNull(epLocs);
Assert.assertEquals(4, epLocs.size());
- assertProviderAddressEndpointLocation(client1Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client1IfaceName), epLocs);
+ assertProviderAddressEndpointLocation(client1Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client1IfaceName), epLocs);
assertProviderAddressEndpointLocation(web1Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web1IfaceName), epLocs);
- assertProviderAddressEndpointLocation(client2Ep.getKey(),
- absoluteLocation(VPP_NODE_1_IID, L2FD_CTX.getValue(), client2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web1IfaceName),
+ epLocs);
+ assertProviderAddressEndpointLocation(client2Ep.getKey(), DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_1_IID,
+ DtoFactory.L2FD_CTX.getValue(), client2IfaceName), epLocs);
assertProviderAddressEndpointLocation(web2Ep.getKey(),
- absoluteLocation(VPP_NODE_2_IID, L2FD_CTX.getValue(), web2IfaceName), epLocs);
+ DtoFactory.absoluteLocation(DtoFactory.VPP_NODE_2_IID, DtoFactory.L2FD_CTX.getValue(), web2IfaceName),
+ epLocs);
// #####################################################################################
}
- private static AbsoluteLocation absoluteLocation(InstanceIdentifier<?> mountPoint, String nodeName,
- String nodeConnectorName) {
- ExternalLocationCaseBuilder extLocBuilder =
- new ExternalLocationCaseBuilder().setExternalNodeMountPoint(mountPoint);
- if (!Strings.isNullOrEmpty(nodeName)) {
- extLocBuilder.setExternalNode(VppPathMapper.bridgeDomainToRestPath(nodeName));
- }
- if (!Strings.isNullOrEmpty(nodeConnectorName)) {
- extLocBuilder.setExternalNodeConnector(VppPathMapper.interfaceToRestPath(nodeConnectorName));
- }
- return new AbsoluteLocationBuilder().setLocationType(extLocBuilder.build()).build();
- }
-
- private AddressEndpointWithLocation createEndpoint(String ip, String l2FdIdAsNetCont,
- AbsoluteLocation absoluteLocation) {
- AddressEndpointWithLocationKey key =
- new AddressEndpointWithLocationKey(ip, AddressType.class, CTX_ID, ContextType.class);
- NetworkContainment networkContainment =
- new NetworkContainmentBuilder().setContainment(new ForwardingContextContainmentBuilder()
- .setContextType(L2FloodDomain.class).setContextId(new ContextId(l2FdIdAsNetCont)).build()).build();
- return new AddressEndpointWithLocationBuilder().setKey(key)
- .setNetworkContainment(networkContainment)
- .setAbsoluteLocation(absoluteLocation)
- .build();
- }
-
private InstanceIdentifier<VppEndpoint> createVppEndpointIid(AddressEndpointWithLocationKey key) {
return InstanceIdentifier.builder(Config.class)
.child(VppEndpoint.class, new VppEndpointKey(key.getAddress(), key.getAddressType(), key.getContextId(),
.build();
}
- private Configuration createConfiguration(List<AddressEndpointWithLocation> consumers,
- List<AddressEndpointWithLocation> providers) {
- List<AddressEndpointWithLocation> eps =
- Stream.concat(consumers.stream(), providers.stream()).collect(Collectors.toList());
- Endpoints endpoints = new EndpointsBuilder().setAddressEndpointWithLocation(eps).build();
- List<RendererEndpoint> consumersAsRendererEps = consumers.stream().map(cons -> {
- List<PeerEndpointWithPolicy> peers = providers.stream()
- .map(web -> new PeerEndpointWithPolicyBuilder()
- .setKey(KeyFactory.peerEndpointWithPolicyKey(web.getKey()))
- .setRuleGroupWithRendererEndpointParticipation(Arrays.asList(RULE_GROUP_WITH_CONSUMER))
- .build())
- .collect(Collectors.toList());
- return new RendererEndpointBuilder().setKey(KeyFactory.rendererEndpointKey(cons.getKey()))
- .setPeerEndpointWithPolicy(peers)
- .build();
- }).collect(Collectors.toList());
- List<RendererEndpoint> providersAsRendererEps = providers.stream().map(prov -> {
- List<PeerEndpointWithPolicy> peers = consumers.stream()
- .map(client -> new PeerEndpointWithPolicyBuilder()
- .setKey(KeyFactory.peerEndpointWithPolicyKey(client.getKey()))
- .setRuleGroupWithRendererEndpointParticipation(Arrays.asList(RULE_GROUP_WITH_PROVIDER))
- .build())
- .collect(Collectors.toList());
- return new RendererEndpointBuilder().setKey(KeyFactory.rendererEndpointKey(prov.getKey()))
- .setPeerEndpointWithPolicy(peers)
- .build();
- }).collect(Collectors.toList());
- List<RendererEndpoint> rendererEps = Stream
- .concat(consumersAsRendererEps.stream(), providersAsRendererEps.stream()).collect(Collectors.toList());
- return new ConfigurationBuilder().setEndpoints(endpoints)
- .setRendererEndpoints(new RendererEndpointsBuilder().setRendererEndpoint(rendererEps).build())
- .setRuleGroups(new RuleGroupsBuilder().setRuleGroup(Arrays.asList(RULE_GROUP)).build())
- .build();
- }
-
private void assertProviderAddressEndpointLocation(AddressEndpointWithLocationKey expectedEpKey,
AbsoluteLocation expectedEpLoc, List<ProviderAddressEndpointLocation> providerEpLocs) {
List<ProviderAddressEndpointLocation> expectedProvEpLoc =
.setContextId(epKey.getContextId())
.setContextType(epKey.getContextType())
.setVppInterfaceName(ifaceName)
- .setVppNodePath(VPP_NODE_1_IID)
+ .setVppNodeId(DtoFactory.VPP_NODE_1_IID.firstKeyOf(Node.class).getNodeId())
.setInterfaceTypeChoice(new VhostUserCaseBuilder().setSocket(SOCKET).build())
.build();
VppEndpointConfEvent vppEpEvent = new VppEndpointConfEvent(vppEpIid, null, vhostEp);
Code Review / groupbasedpolicy.git / blobdiff