Change-Id: I017bbdc5c8f5272e68fd9b42f56152de61ada725
Signed-off-by: Rashmi Pujar <rpujar@inocybe.com>
<bundle>mvn:org.opendaylight.vpnservice/elanmanager-impl/${elanmgr.version}</bundle>
<!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.1.0-SNAPSHOT</bundle>-->
<bundle>mvn:org.opendaylight.vpnservice/elanmanager-impl/${elanmgr.version}</bundle>
<!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.1.0-SNAPSHOT</bundle>-->
- <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.0.1-SNAPSHOT</bundle>-->
<bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&Bundle-Version=0.9.1&Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
<!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
<configfile finalname="lockmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config</configfile>
<bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&Bundle-Version=0.9.1&Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
<!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
<configfile finalname="lockmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config</configfile>
<artifactId>intent-api</artifactId>
<version>${nic.version}</version>
</dependency>
<artifactId>intent-api</artifactId>
<version>${nic.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.nic</groupId>
+ <artifactId>intent-mapping-interface</artifactId>
+ <version>${nic.version}</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.nic</groupId>
<artifactId>utils</artifactId>
<dependency>
<groupId>org.opendaylight.nic</groupId>
<artifactId>utils</artifactId>
<scope>test</scope>
</dependency>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.opendaylight.nic</groupId>
- <artifactId>intent-mapping-interface</artifactId>
- <version>${nic.version}</version>
- </dependency>
</dependencies>
</project>
</dependencies>
</project>
import com.google.common.base.Preconditions;
import com.google.common.base.Preconditions;
+/**
+ * This class is used to build Intents object and
+ * write it to Network Intent Composition md-sal tree
+ * in order to create/delete intents between two endpoint groups.
+ */
public class IntentServiceManager {
public class IntentServiceManager {
- /**
- * This class is used to build Intents object and
- * write it to Network Intent Composition md-sal tree
- * in order to create/delete intents between two endpoint groups.
- */
-
private static final Logger LOG = LoggerFactory.getLogger(IntentServiceManager.class);
private static final short FIRST_SUBJECT = 1;
private static final short SECOND_SUBJECT = 2;
private static final Logger LOG = LoggerFactory.getLogger(IntentServiceManager.class);
private static final short FIRST_SUBJECT = 1;
private static final short SECOND_SUBJECT = 2;
public static final String SLOW_REROUTE = "slow-reroute";
private final DataBroker dataBroker;
private static final InstanceIdentifier<Intents> INTENTS_IID = IidFactory.getIntentsIid();
public static final String SLOW_REROUTE = "slow-reroute";
private final DataBroker dataBroker;
private static final InstanceIdentifier<Intents> INTENTS_IID = IidFactory.getIntentsIid();
- private MdsalUtils mdsal;
+ private final MdsalUtils mdsal;
public IntentServiceManager(DataBroker dataBroker) {
this.dataBroker = dataBroker;
public IntentServiceManager(DataBroker dataBroker) {
this.dataBroker = dataBroker;
import java.util.Map;
import org.opendaylight.nic.mapping.api.IntentMappingService;
import java.util.Map;
import org.opendaylight.nic.mapping.api.IntentMappingService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
public class MappingServiceManager {
import com.google.common.base.Preconditions;
public class MappingServiceManager {
+ private static final Logger LOG = LoggerFactory.getLogger(MappingServiceManager.class);
private IntentMappingService intentMappingService;
private String IP_PREFIX_PROPERTY = "ip_prefix";
private String SWITCH_PORT_ID_PROPERTY = "switch_port";
private IntentMappingService intentMappingService;
private String IP_PREFIX_PROPERTY = "ip_prefix";
private String SWITCH_PORT_ID_PROPERTY = "switch_port";
intentMappingService.add(siteName, null);
return true;
} catch (Exception e) {
intentMappingService.add(siteName, null);
return true;
} catch (Exception e) {
+ LOG.error("Error deleting from NIC's mapping service {}", e);
public static final InstanceIdentifier<MplsLabels> MPLS_LABELS_IID = IidFactory.getMplsLabelsIid();
private final DataBroker dataBroker;
private final Random random = new Random();
public static final InstanceIdentifier<MplsLabels> MPLS_LABELS_IID = IidFactory.getMplsLabelsIid();
private final DataBroker dataBroker;
private final Random random = new Random();
- private MdsalUtils mdsal;
+ private final MdsalUtils mdsal;
public MplsLabelManagerService(DataBroker dataBroker) {
this.dataBroker = dataBroker;
public MplsLabelManagerService(DataBroker dataBroker) {
this.dataBroker = dataBroker;