Change-Id: I2a653b371ddfe54080bdb5ad5d4c3e9590c83a5a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Michal Cmarada <michal.cmarada@pantheon.tech>
25 files changed:
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.forwarding.forwarding.by.tenant.NetworkDomainKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.forwarding.rev160427.forwarding.forwarding.by.tenant.NetworkDomainKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-public class L2L3IidFactory {
+public final class L2L3IidFactory {
+
+ private L2L3IidFactory() {
+ }
public static InstanceIdentifier<NetworkDomain> subnetIid(TenantId tenantId, NetworkDomainId id) {
NetworkDomainKey domainKey = new NetworkDomainKey(id, Subnet.class);
public static InstanceIdentifier<NetworkDomain> subnetIid(TenantId tenantId, NetworkDomainId id) {
NetworkDomainKey domainKey = new NetworkDomainKey(id, Subnet.class);
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.util.concurrent.CheckedFuture;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
@Test
public void test_NetworkElementsListenerRegistration() {
@Test
public void test_NetworkElementsListenerRegistration() {
- DataBroker dataBroker = mock(DataBroker.class);
- NeLocationProvider provider = new NeLocationProvider(dataBroker);
- verify(dataBroker).registerDataTreeChangeListener(new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
+ DataBroker mockDataBroker = mock(DataBroker.class);
+ NeLocationProvider provider = new NeLocationProvider(mockDataBroker);
+ verify(mockDataBroker).registerDataTreeChangeListener(
+ new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION,
InstanceIdentifier.builder(NetworkElements.class).build()), provider);
}
@Test
public void test_EndpointsListenerRegistration() {
InstanceIdentifier.builder(NetworkElements.class).build()), provider);
}
@Test
public void test_EndpointsListenerRegistration() {
- DataBroker dataBroker = mock(DataBroker.class);
- new NeLocationProvider(dataBroker);
- verify(dataBroker)
+ DataBroker mockDataBroker = mock(DataBroker.class);
+ new NeLocationProvider(mockDataBroker);
+ verify(mockDataBroker)
.registerDataTreeChangeListener(eq(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL,
InstanceIdentifier.builder(Endpoints.class).child(AddressEndpoints.class)
.child(AddressEndpoint.class).build())), isA(EndpointsListener.class));
.registerDataTreeChangeListener(eq(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL,
InstanceIdentifier.builder(Endpoints.class).child(AddressEndpoints.class)
.child(AddressEndpoint.class).build())), isA(EndpointsListener.class));
@Test
public void test_ListenersUnregistration() {
@Test
public void test_ListenersUnregistration() {
- DataBroker dataBroker = mock(DataBroker.class);
+ DataBroker mockDataBroker = mock(DataBroker.class);
ListenerRegistration<EndpointsListener> endpointsListenerRegistration = mock(ListenerRegistration.class);
ListenerRegistration<EndpointsListener> endpointsListenerRegistration = mock(ListenerRegistration.class);
- when(dataBroker.registerDataTreeChangeListener(any(), isA(EndpointsListener.class)))
+ when(mockDataBroker.registerDataTreeChangeListener(any(), isA(EndpointsListener.class)))
.thenReturn(endpointsListenerRegistration);
ListenerRegistration<NeLocationProvider> nelistenerregistration = mock(ListenerRegistration.class);
.thenReturn(endpointsListenerRegistration);
ListenerRegistration<NeLocationProvider> nelistenerregistration = mock(ListenerRegistration.class);
- when(dataBroker.registerDataTreeChangeListener(any(), isA(NeLocationProvider.class)))
+ when(mockDataBroker.registerDataTreeChangeListener(any(), isA(NeLocationProvider.class)))
.thenReturn(nelistenerregistration);
.thenReturn(nelistenerregistration);
- NeLocationProvider provider = new NeLocationProvider(dataBroker);
+ NeLocationProvider provider = new NeLocationProvider(mockDataBroker);
provider.close();
verify(endpointsListenerRegistration).close();
verify(nelistenerregistration).close();
provider.close();
verify(endpointsListenerRegistration).close();
verify(nelistenerregistration).close();
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.provider.networks.as.l2.flood.domains.ProviderPhysicalNetworkAsL2FloodDomainKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.provider.networks.as.l2.flood.domains.ProviderPhysicalNetworkAsL2FloodDomainKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-public class NeutronGbpIidFactory {
+public final class NeutronGbpIidFactory {
+
+ private NeutronGbpIidFactory() {
+ }
public static InstanceIdentifier<BaseEndpointByPort> baseEndpointByPortIid(UniqueId portId) {
return InstanceIdentifier.builder(Mappings.class)
public static InstanceIdentifier<BaseEndpointByPort> baseEndpointByPortIid(UniqueId portId) {
return InstanceIdentifier.builder(Mappings.class)
package org.opendaylight.groupbasedpolicy.neutron.mapper.infrastructure;
import com.google.common.collect.ImmutableList;
package org.opendaylight.groupbasedpolicy.neutron.mapper.infrastructure;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstance;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstanceBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstance;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.tenants.tenant.policy.subject.feature.instances.ClassifierInstanceBuilder;
+// This is sub-classed
+@SuppressWarnings("checkstyle:HideUtilityClassConstructor")
public class ServiceUtil {
public class ServiceUtil {
protected static Contract createContract(ContractId cid, List<Subject> subjects, Description description) {
return new ContractBuilder().setId(cid).setSubject(subjects).setDescription(description).build();
}
protected static Contract createContract(ContractId cid, List<Subject> subjects, Description description) {
return new ContractBuilder().setId(cid).setSubject(subjects).setDescription(description).build();
}
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.ports.by.endpoints.PortByEndpointBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.neutron.by.gbp.mappings.ports.by.endpoints.PortByEndpointBuilder;
-public class MappingFactory {
+public final class MappingFactory {
private MappingFactory() {
throw new UnsupportedOperationException("cannot create an instance");
private MappingFactory() {
throw new UnsupportedOperationException("cannot create an instance");
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableList;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.EtherTypeClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.IpProtoClassifierDefinition;
import org.opendaylight.groupbasedpolicy.api.sf.L4ClassifierDefinition;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
-public class SecRuleEntityDecoder {
+public final class SecRuleEntityDecoder {
private SecRuleEntityDecoder() {
throw new UnsupportedOperationException("Cannot create an instance.");
private SecRuleEntityDecoder() {
throw new UnsupportedOperationException("Cannot create an instance.");
if (twoPortMin == null && twoPortMax == null) {
return true;
}
if (twoPortMin == null && twoPortMax == null) {
return true;
}
- if ((onePortMin != null && twoPortMin != null && onePortMin >= twoPortMin)
- && (onePortMax != null && twoPortMax != null && onePortMax <= twoPortMax)) {
+ if (onePortMin != null && twoPortMin != null && onePortMin >= twoPortMin
+ && onePortMax != null && twoPortMax != null && onePortMax <= twoPortMax) {
return true;
}
return false;
return true;
}
return false;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.SecurityRuleAttributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
-public class SecRuleNameDecoder {
+public final class SecRuleNameDecoder {
static final String MIN_PORT = "_min";
static final String MAX_PORT = "_max";
static final String MIN_PORT = "_min";
static final String MAX_PORT = "_max";
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.Networks;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtension;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.Networks;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtension;
-public class NetworkUtils {
+public final class NetworkUtils {
+
+ private NetworkUtils() {
+ }
public static List<Network> findRouterExternalNetworks(@Nullable Networks networks) {
if (networks == null || networks.getNetwork() == null) {
public static List<Network> findRouterExternalNetworks(@Nullable Networks networks) {
if (networks == null || networks.getNetwork() == null) {
}
public static boolean isProviderPhysicalNetwork(Network network) {
}
public static boolean isProviderPhysicalNetwork(Network network) {
- return (!isRouterExternal(network) && !getPhysicalNetwork(network).isEmpty());
+ return !isRouterExternal(network) && !getPhysicalNetwork(network).isEmpty();
}
public static boolean isRouterExternal(Network network) {
}
public static boolean isRouterExternal(Network network) {
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.NetworkDomainId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.binding.rev150712.PortBindingExtension;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.NetworkDomainId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.binding.rev150712.PortBindingExtension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.Ports;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
-public class PortUtils {
+public final class PortUtils {
+ private PortUtils() {
+ }
public static final String DEVICE_OWNER_DHCP = "network:dhcp";
public static final String DEVICE_OWNER_ROUTER_IFACE = "network:router_interface";
public static final String DEVICE_OWNER_DHCP = "network:dhcp";
public static final String DEVICE_OWNER_ROUTER_IFACE = "network:router_interface";
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.Routers;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.Router;
-public class RouterUtils {
+public final class RouterUtils {
+ private RouterUtils() {
+ }
public static Optional<Router> findRouter(Uuid uuid, @Nullable Routers routers) {
if (routers == null || routers.getRouter() == null) {
public static Optional<Router> findRouter(Uuid uuid, @Nullable Routers routers) {
if (routers == null || routers.getRouter() == null) {
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.SecurityGroups;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.groups.attributes.security.groups.SecurityGroup;
-public class SecurityGroupUtils {
+public final class SecurityGroupUtils {
+ private SecurityGroupUtils() {
+ }
public static Optional<SecurityGroup> findSecurityGroup(Uuid secGrpUuid, @Nullable SecurityGroups securityGroups) {
Preconditions.checkNotNull(secGrpUuid);
public static Optional<SecurityGroup> findSecurityGroup(Uuid secGrpUuid, @Nullable SecurityGroups securityGroups) {
Preconditions.checkNotNull(secGrpUuid);
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
-import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.FluentIterable;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.SecurityRules;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.SecurityRules;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
-public class SecurityRuleUtils {
+public final class SecurityRuleUtils {
+ private SecurityRuleUtils() {
+ }
public static Optional<SecurityRule> findSecurityRule(Uuid uuid, @Nullable SecurityRules securityRules) {
if (securityRules == null || securityRules.getSecurityRule() == null) {
public static Optional<SecurityRule> findSecurityRule(Uuid uuid, @Nullable SecurityRules securityRules) {
if (securityRules == null || securityRules.getSecurityRule() == null) {
public static Set<SecurityRule> findSecurityRulesBySecGroupAndRemoteSecGroup(Uuid secGroup,
@Nullable Uuid remoteSecGroup, Neutron neutron) {
Preconditions.checkNotNull(secGroup);
public static Set<SecurityRule> findSecurityRulesBySecGroupAndRemoteSecGroup(Uuid secGroup,
@Nullable Uuid remoteSecGroup, Neutron neutron) {
Preconditions.checkNotNull(secGroup);
- return FluentIterable.from(findAllSecurityRules(neutron)).filter(new Predicate<SecurityRule>() {
-
- @Override
- public boolean apply(SecurityRule secRule) {
- return (secRule.getSecurityGroupId().equals(secGroup)
- && Objects.equal(secRule.getRemoteGroupId(), remoteSecGroup));
- }
- }).toSet();
+ return FluentIterable.from(findAllSecurityRules(neutron)).filter(
+ secRule -> (secRule.getSecurityGroupId().equals(secGroup)
+ && Objects.equal(secRule.getRemoteGroupId(), remoteSecGroup))).toSet();
}
public static Set<Uuid> findSecurityGroupsHavingSecurityRules(Neutron neutron) {
}
public static Set<Uuid> findSecurityGroupsHavingSecurityRules(Neutron neutron) {
- return FluentIterable.from(findAllSecurityRules(neutron)).transform(new Function<SecurityRule, Uuid>() {
-
- @Override
- public Uuid apply(SecurityRule secRule) {
- return secRule.getSecurityGroupId();
- }
- }).toSet();
+ return FluentIterable.from(findAllSecurityRules(neutron)).transform(
+ secRule -> secRule.getSecurityGroupId()).toSet();
}
public static List<SecurityRule> findAllSecurityRules(Neutron neutron) {
}
public static List<SecurityRule> findAllSecurityRules(Neutron neutron) {
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
package org.opendaylight.groupbasedpolicy.neutron.mapper.util;
import com.google.common.base.Optional;
import javax.annotation.Nullable;
import javax.annotation.Nullable;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
-public class SubnetUtils {
+public final class SubnetUtils {
+ private SubnetUtils() {
+ }
public static Optional<Subnet> findSubnet(Uuid uuid, @Nullable Subnets subnets) {
if (subnets == null || subnets.getSubnet() == null) {
public static Optional<Subnet> findSubnet(Uuid uuid, @Nullable Subnets subnets) {
if (subnets == null || subnets.getSubnet() == null) {
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.net.InetAddresses;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.net.InetAddresses;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.Inet4Address;
import java.net.InetAddress;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.groupbasedpolicy.util.IidFactory;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.groupbasedpolicy.util.IidFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+public final class Utils {
private static final String MASK_32 = "/32";
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
private static final String MASK_32 = "/32";
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
import static org.mockito.Mockito.when;
import com.google.common.base.Optional;
import static org.mockito.Mockito.when;
import com.google.common.base.Optional;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
private Future<RpcResult<Void>> futureRpcFail;
private RpcResult<Void> rpcResult;
private RpcResult<Void> rpcFail;
private Future<RpcResult<Void>> futureRpcFail;
private RpcResult<Void> rpcResult;
private RpcResult<Void> rpcFail;
- private Network network;
private NetworkProviderExtension providerExtension;
@Before
private NetworkProviderExtension providerExtension;
@Before
.setSegmentationId("segmentationId")
.build();
.setSegmentationId("segmentationId")
.build();
- network = new NetworkBuilder().setTenantId(tenantUuid)
- .setUuid(networkUuid)
- .setName("networkName")
- .addAugmentation(NetworkProviderExtension.class, providerExtension)
- .build();
-
networkAware = new NeutronNetworkAware(dataBroker, METADATA_IPV4_SERVER_PORT);
}
networkAware = new NeutronNetworkAware(dataBroker, METADATA_IPV4_SERVER_PORT);
}
@Test
public void testOnCreated() {
@Test
public void testOnCreated() {
+ Network network = new NetworkBuilder().setTenantId(tenantUuid)
+ .setUuid(networkUuid)
+ .setName("networkName")
+ .addAugmentation(NetworkProviderExtension.class, providerExtension)
+ .build();
networkAware.onCreated(network, neutron);
networkAware.onCreated(network, neutron);
import static org.junit.Assert.assertTrue;
import com.google.common.base.Optional;
import static org.junit.Assert.assertTrue;
import com.google.common.base.Optional;
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.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.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-public class NeutronMapperAssert {
+public final class NeutronMapperAssert {
+ private NeutronMapperAssert() {
+ }
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
* Check to see if we need to create a
* tunnel port on the parent node
*/
* Check to see if we need to create a
* tunnel port on the parent node
*/
- createTunnelPorts(nodeIid, dataBroker);
+ createTunnelPorts(nodeIid);
}
} else {
LOG.debug("TerminationPoint {} had no external ID, not processing for external ID.", ovsdbTp);
}
} else {
LOG.debug("TerminationPoint {} had no external ID, not processing for external ID.", ovsdbTp);
*
* @return true if it's a required tunnel port, false if it isn't
*/
*
* @return true if it's a required tunnel port, false if it isn't
*/
- private boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
+ private static boolean isTunnelPort(OvsdbTerminationPointAugmentation ovsdbTp,
List<AbstractTunnelType> requiredTunnelTypes) {
if (ovsdbTp.getInterfaceType() != null) {
for (AbstractTunnelType tunnelType : requiredTunnelTypes) {
List<AbstractTunnelType> requiredTunnelTypes) {
if (ovsdbTp.getInterfaceType() != null) {
for (AbstractTunnelType tunnelType : requiredTunnelTypes) {
* create them.
*
* @param nodeIid {@link InstanceIdentifier}
* create them.
*
* @param nodeIid {@link InstanceIdentifier}
- * @param dataBroker {@link DataBroker}
- private void createTunnelPorts(InstanceIdentifier<Node> nodeIid, DataBroker dataBroker) {
+ private void createTunnelPorts(InstanceIdentifier<Node> nodeIid) {
Node node = getTopologyNode(nodeIid, dataBroker);
checkNotNull(node);
Node node = getTopologyNode(nodeIid, dataBroker);
checkNotNull(node);
import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid;
import com.google.common.base.Optional;
import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid;
import com.google.common.base.Optional;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-public class EndpointHelper {
+public final class EndpointHelper {
+ private EndpointHelper() {
+ }
/**
* Look up the {@link Endpoint} from the Endpoint Registry.
/**
* Look up the {@link Endpoint} from the Endpoint Registry.
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
import com.google.common.base.Optional;
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
import com.google.common.base.Optional;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.apache.commons.lang3.StringUtils;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class InventoryHelper {
+public final class InventoryHelper {
private static final Logger LOG = LoggerFactory.getLogger(InventoryHelper.class);
private static final String HEX = "0x";
private static final Logger LOG = LoggerFactory.getLogger(InventoryHelper.class);
private static final String HEX = "0x";
+ private InventoryHelper() {
+ }
+
/**
* Convert an OpenFlow Datapath ID to a Long.
*
/**
* Convert an OpenFlow Datapath ID to a Long.
*
*/
public static Long getLongFromDpid(String dpid) {
String[] addressInBytes = dpid.split(":");
*/
public static Long getLongFromDpid(String dpid) {
String[] addressInBytes = dpid.split(":");
- Long address = (Long.decode(HEX + addressInBytes[2]) << 40) | (Long.decode(HEX + addressInBytes[3]) << 32)
- | (Long.decode(HEX + addressInBytes[4]) << 24) | (Long.decode(HEX + addressInBytes[5]) << 16)
- | (Long.decode(HEX + addressInBytes[6]) << 8) | (Long.decode(HEX + addressInBytes[7]));
+ Long address = Long.decode(HEX + addressInBytes[2]) << 40 | Long.decode(HEX + addressInBytes[3]) << 32
+ | Long.decode(HEX + addressInBytes[4]) << 24 | Long.decode(HEX + addressInBytes[5]) << 16
+ | Long.decode(HEX + addressInBytes[6]) << 8 | Long.decode(HEX + addressInBytes[7]);
public static void updateOfOverlayConfig(IpAddress ip, String nodeIdString, String nodeConnectorIdString,
AbstractTunnelType tunnelType, DataBroker dataBroker) {
public static void updateOfOverlayConfig(IpAddress ip, String nodeIdString, String nodeConnectorIdString,
AbstractTunnelType tunnelType, DataBroker dataBroker) {
- if ((ip == null) || (nodeIdString == null) || (nodeConnectorIdString == null)) {
+ if (ip == null || nodeIdString == null || nodeConnectorIdString == null) {
LOG.debug("Can't update OfOverlay: requisite information not present");
return;
}
LOG.debug("Can't update OfOverlay: requisite information not present");
return;
}
// If it exists, use it in new augmentation constructor, else new augmentation
OfOverlayNodeConfigBuilder ofOverlayNodeConfigBuilder;
// If it exists, use it in new augmentation constructor, else new augmentation
OfOverlayNodeConfigBuilder ofOverlayNodeConfigBuilder;
- Set<Tunnel> existingTunnels = new HashSet<Tunnel>();
+ Set<Tunnel> existingTunnels = new HashSet<>();
if (ofConfig != null) {
ofOverlayNodeConfigBuilder = new OfOverlayNodeConfigBuilder(ofConfig);
if (ofConfig.getTunnel() != null) {
if (ofConfig != null) {
ofOverlayNodeConfigBuilder = new OfOverlayNodeConfigBuilder(ofConfig);
if (ofConfig.getTunnel() != null) {
// Update the OfOverlayNodeConfig with the new tunnel information
if (!existingTunnels.isEmpty()) {
// Update the OfOverlayNodeConfig with the new tunnel information
if (!existingTunnels.isEmpty()) {
- ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<Tunnel>(existingTunnels));
+ ofOverlayNodeConfigBuilder.setTunnel(new ArrayList<>(existingTunnels));
}
OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build();
if (addOfOverlayConfig(newConfig, new NodeId(nodeIdString), dataBroker)) {
}
OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build();
if (addOfOverlayConfig(newConfig, new NodeId(nodeIdString), dataBroker)) {
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
import com.google.common.base.Optional;
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
import com.google.common.base.Optional;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPortKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPortKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-public class NeutronHelper {
+public final class NeutronHelper {
+ private NeutronHelper() {
+ }
/**
* This looks up the Endpoint L2 key from an
/**
* This looks up the Endpoint L2 key from an
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 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;
-public class NeutronOvsdbIidFactory {
+public final class NeutronOvsdbIidFactory {
+ private NeutronOvsdbIidFactory() {
+ }
public static InstanceIdentifier<Topology> topologyIid(TopologyId ovsdbTopologyId) {
return InstanceIdentifier.create(NetworkTopology.class)
public static InstanceIdentifier<Topology> topologyIid(TopologyId ovsdbTopologyId) {
return InstanceIdentifier.create(NetworkTopology.class)
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
import com.google.common.base.Optional;
import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs;
import com.google.common.base.Optional;
import java.util.ArrayList;
import java.util.List;
import java.util.ArrayList;
import java.util.List;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class OvsdbHelper {
+public final class OvsdbHelper {
+ private OvsdbHelper() {
+ }
+
private static final Logger LOG = LoggerFactory.getLogger(OvsdbHelper.class);
private static final String OF_PORT = "6653";
private static final Logger LOG = LoggerFactory.getLogger(OvsdbHelper.class);
private static final String OF_PORT = "6653";
tpBuilder.setTpId(new TpId(new Uri(generateTpName(bridge, tunnelType))));
tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, ovsdbTp);
tpBuilder.setTpId(new TpId(new Uri(generateTpName(bridge, tunnelType))));
tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, ovsdbTp);
- List<TerminationPoint> tps = new ArrayList<TerminationPoint>();
+ List<TerminationPoint> tps = new ArrayList<>();
tps.add(tpBuilder.build());
return tps;
}
tps.add(tpBuilder.build());
return tps;
}
}
public static List<ControllerEntry> buildControllerEntries(IpAddress ip) {
}
public static List<ControllerEntry> buildControllerEntries(IpAddress ip) {
- List<ControllerEntry> result = new ArrayList<ControllerEntry>();
+ List<ControllerEntry> result = new ArrayList<>();
if (ip != null) {
ControllerEntryBuilder controllerBuilder = new ControllerEntryBuilder();
if (ip != null) {
ControllerEntryBuilder controllerBuilder = new ControllerEntryBuilder();
import com.google.common.base.Optional;
import com.google.common.util.concurrent.CheckedFuture;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.CheckedFuture;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.junit.Before;
import org.junit.Test;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
OvsdbBridgeAugmentationBuilder augmentationBuilder = new OvsdbBridgeAugmentationBuilder();
augmentationBuilder.setBridgeName(new OvsdbBridgeName("bridgeName"));
OvsdbBridgeAugmentationBuilder augmentationBuilder = new OvsdbBridgeAugmentationBuilder();
augmentationBuilder.setBridgeName(new OvsdbBridgeName("bridgeName"));
- Node node = OvsdbHelper.getNode(nodeBuilder.build(), Collections.singletonList(tpBuilder.build()),
+ Node tpNode = OvsdbHelper.getNode(nodeBuilder.build(), Collections.singletonList(tpBuilder.build()),
augmentationBuilder.build());
augmentationBuilder.build());
- assertNotNull(node);
- assertEquals("nodeId", node.getKey().getNodeId().getValue());
- assertEquals(1, node.getTerminationPoint().size());
- TerminationPoint terminationPoint = node.getTerminationPoint().get(0);
+ assertNotNull(tpNode);
+ assertEquals("nodeId", tpNode.getKey().getNodeId().getValue());
+ assertEquals(1, tpNode.getTerminationPoint().size());
+ TerminationPoint terminationPoint = tpNode.getTerminationPoint().get(0);
assertNotNull(terminationPoint);
assertEquals("tpId", terminationPoint.getKey().getTpId().getValue());
assertNotNull(terminationPoint);
assertEquals("tpId", terminationPoint.getKey().getTpId().getValue());
- assertEquals("bridgeName", node.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue());
+ assertEquals("bridgeName", tpNode.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue());
final Action action = actionBuilder(Collections.singletonList(parameterValue));
final PolicyConfigurationContext context = policyConfigurationContextBuilder();
final Action action = actionBuilder(Collections.singletonList(parameterValue));
final PolicyConfigurationContext context = policyConfigurationContextBuilder();
- stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(pathsBuilder.build());
+ stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+ .toReturn(pathsBuilder.build());
stub(method(PolicyManagerUtil.class, "getTenantId")).toReturn(null);
ServiceChainingUtil.newChainAction(peerEndpoint, sgtBuilder(10), sgtBuilder(20),
stub(method(PolicyManagerUtil.class, "getTenantId")).toReturn(null);
ServiceChainingUtil.newChainAction(peerEndpoint, sgtBuilder(10), sgtBuilder(20),
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
- stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+ stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+ .toReturn(forwarderBuilder.build());
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
- stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+ stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+ .toReturn(forwarderBuilder.build());
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
- stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+ stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+ .toReturn(forwarderBuilder.build());
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
- stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+ stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+ .toReturn(forwarderBuilder.build());
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
boolean result = ServiceChainingUtil.resolveRemoteSfcComponents(rspBuilder.build(), context);
assertFalse(result);
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
final RenderedServicePathBuilder rspBuilder = new RenderedServicePathBuilder();
rspBuilder.setRenderedServicePathHop(Collections.singletonList(hopBuilder.build()));
- stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder")).toReturn(forwarderBuilder.build());
+ stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
+ .toReturn(forwarderBuilder.build());
stub(method(PolicyWriterUtil.class, "writeServicePath")).toReturn(true);
stub(method(PolicyWriterUtil.class, "writeRemote")).toReturn(true);
stub(method(PolicyWriterUtil.class, "writeServicePath")).toReturn(true);
stub(method(PolicyWriterUtil.class, "writeRemote")).toReturn(true);
@Test
public void testFindServicePathFromParameterValues_noParams() {
@Test
public void testFindServicePathFromParameterValues_noParams() {
- final ServiceFunctionPath result = ServiceChainingUtil.findServicePathFromParameterValues(Collections.emptyList());
+ final ServiceFunctionPath result =
+ ServiceChainingUtil.findServicePathFromParameterValues(Collections.emptyList());
public void findServiceFunctionPathFromServiceChainName_noPaths() {
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(null);
public void findServiceFunctionPathFromServiceChainName_noPaths() {
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(null);
- final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+ final ServiceFunctionPath result =
+ ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
public void findServiceFunctionPathFromServiceChainName_noPathFound() {
final ServiceFunctionPathBuilder serviceFunctionPathBuilder = new ServiceFunctionPathBuilder();
final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
public void findServiceFunctionPathFromServiceChainName_noPathFound() {
final ServiceFunctionPathBuilder serviceFunctionPathBuilder = new ServiceFunctionPathBuilder();
final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
- serviceFunctionPathsBuilder.setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
+ serviceFunctionPathsBuilder
+ .setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
- stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(serviceFunctionPathsBuilder.build());
+ stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+ .toReturn(serviceFunctionPathsBuilder.build());
- final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+ final ServiceFunctionPath result =
+ ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
serviceFunctionPathBuilder.setName(new SfpName(SFC_PATH_NAME))
.setServiceChainName(new SfcName(SFC_CHAIN_NAME));
final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
serviceFunctionPathBuilder.setName(new SfpName(SFC_PATH_NAME))
.setServiceChainName(new SfcName(SFC_CHAIN_NAME));
final ServiceFunctionPathsBuilder serviceFunctionPathsBuilder = new ServiceFunctionPathsBuilder();
- serviceFunctionPathsBuilder.setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
+ serviceFunctionPathsBuilder
+ .setServiceFunctionPath(Collections.singletonList(serviceFunctionPathBuilder.build()));
- stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(serviceFunctionPathsBuilder.build());
+ stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths"))
+ .toReturn(serviceFunctionPathsBuilder.build());
- final ServiceFunctionPath result = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
+ final ServiceFunctionPath result =
+ ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(SFC_CHAIN_NAME));
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
- stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(new RenderedServicePathBuilder().build());
+ stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+ .toReturn(new RenderedServicePathBuilder().build());
final RenderedServicePath result = ServiceChainingUtil.resolveRenderedServicePath(serviceFunctionPath, tenantId,
dataBroker, sourceSgt, destinationSgt, context);
final RenderedServicePath result = ServiceChainingUtil.resolveRenderedServicePath(serviceFunctionPath, tenantId,
dataBroker, sourceSgt, destinationSgt, context);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
- stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(null);
+ stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+ .toReturn(null);
stub(method(SfcProviderRenderedPathAPI.class, "createRenderedServicePathAndState", ServiceFunctionPath.class,
CreateRenderedPathInput.class)).toReturn(new RenderedServicePathBuilder().build());
stub(method(SfcProviderRenderedPathAPI.class, "createRenderedServicePathAndState", ServiceFunctionPath.class,
CreateRenderedPathInput.class)).toReturn(new RenderedServicePathBuilder().build());
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
- stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(new RenderedServicePathBuilder().build());
+ stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+ .toReturn(new RenderedServicePathBuilder().build());
final RenderedServicePath result = ServiceChainingUtil.resolveReversedRenderedServicePath(serviceFunctionPath,
tenantId, dataBroker, sourceSgt, destinationSgt, context);
final RenderedServicePath result = ServiceChainingUtil.resolveReversedRenderedServicePath(serviceFunctionPath,
tenantId, dataBroker, sourceSgt, destinationSgt, context);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
final ServiceFunctionPath serviceFunctionPath = serviceFunctionPathBuilder.build();
final TenantId tenantId = new TenantId(TENANT_ID);
- stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath")).toReturn(null);
+ stub(method(SfcProviderRenderedPathAPI.class, "readRenderedServicePath",RspName.class))
+ .toReturn(null);
stub(method(SfcProviderRenderedPathAPI.class, "createReverseRenderedServicePathEntry"))
.toReturn(new RenderedServicePathBuilder().build());
stub(method(SfcProviderRenderedPathAPI.class, "createReverseRenderedServicePathEntry"))
.toReturn(new RenderedServicePathBuilder().build());
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
- final ServiceFunctionPath servicePath = ServiceChainingUtil.findServicePathFromParameterValues(Lists.newArrayList(
- createParameterValue(sfcNameValue)
- ));
+ final ServiceFunctionPath servicePath =
+ ServiceChainingUtil.findServicePathFromParameterValues(
+ Lists.newArrayList(createParameterValue(sfcNameValue)));
assertEquals(sfcPath, servicePath);
}
assertEquals(sfcPath, servicePath);
}
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
stub(method(SfcProviderServicePathAPI.class, "readAllServiceFunctionPaths")).toReturn(sfcPaths);
- final ServiceFunctionPath servicePath = ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(sfcNameValue));
+ final ServiceFunctionPath servicePath =
+ ServiceChainingUtil.findServiceFunctionPathFromServiceChainName(new SfcName(sfcNameValue));
assertEquals(sfcPath, servicePath);
}
assertEquals(sfcPath, servicePath);
}
final PeerEndpointBuilder peerEndpointBuilder = new PeerEndpointBuilder();
final RuleGroupWithRendererEndpointParticipationBuilder ruleGroupBuilder =
new RuleGroupWithRendererEndpointParticipationBuilder();
final PeerEndpointBuilder peerEndpointBuilder = new PeerEndpointBuilder();
final RuleGroupWithRendererEndpointParticipationBuilder ruleGroupBuilder =
new RuleGroupWithRendererEndpointParticipationBuilder();
- peerEndpointBuilder.setRuleGroupWithRendererEndpointParticipation(Collections.singletonList(ruleGroupBuilder.build()));
+ peerEndpointBuilder
+ .setRuleGroupWithRendererEndpointParticipation(Collections.singletonList(ruleGroupBuilder.build()));
return peerEndpointBuilder.build();
}
return peerEndpointBuilder.build();
}
final String IP_ADDRESS = "ip-address";
return new PolicyManagerImpl.PolicyMapLocation(POLICY_MAP, INTERFACE, nodeId, IP_ADDRESS, dataBroker);
}
final String IP_ADDRESS = "ip-address";
return new PolicyManagerImpl.PolicyMapLocation(POLICY_MAP, INTERFACE, nodeId, IP_ADDRESS, dataBroker);
}
-}
\ No newline at end of file
new Interface1Builder().setIpv4(new Ipv4Builder().setAddress(Collections.singletonList(
new AddressBuilder()
.setIp(new Ipv4AddressNoZone(IP_ADDRESS.getIpv4Address()))
new Interface1Builder().setIpv4(new Ipv4Builder().setAddress(Collections.singletonList(
new AddressBuilder()
.setIp(new Ipv4AddressNoZone(IP_ADDRESS.getIpv4Address()))
- .setSubnet(new PrefixLengthBuilder().setPrefixLength((short) NetUtils.getMaskFromPrefix(IP_PREFIX.getIpv4Prefix().getValue())).build())
+ .setSubnet(new PrefixLengthBuilder()
+ .setPrefixLength((short) NetUtils.getMaskFromPrefix(IP_PREFIX.getIpv4Prefix().getValue())).build())
.build()))
.setEnabled(true)
.setForwarding(false)
.build()))
.setEnabled(true)
.setForwarding(false)
Assert.assertEquals(UPD_MAC_ADDRESS, augmentation.getLoopback().getMac());
Interface1 interface1 = updatedInterface.getAugmentation(Interface1.class);
Assert.assertEquals(UPD_MAC_ADDRESS, augmentation.getLoopback().getMac());
Interface1 interface1 = updatedInterface.getAugmentation(Interface1.class);
- // merge operation will add new ip address to list so index is 1 for new ip
- String ip = interface1.getIpv4().getAddress().get(1).getIp().getValue();
- Subnet subnet = interface1.getIpv4().getAddress().get(1).getSubnet();
+ String ip = interface1.getIpv4().getAddress().get(0).getIp().getValue();
+ Subnet subnet = interface1.getIpv4().getAddress().get(0).getSubnet();
String prefix = "";
if ( subnet instanceof PrefixLength){
String prefix = "";
if ( subnet instanceof PrefixLength){