MD SAL Util API exposed as a Service

Change-Id: I2664d3f9677e7da17fd965c21981c9a3ea23741d
Signed-off-by: HemaTG <hema.gopalkrishnan@ericsson.com>

diff --git a/features/pom.xml b/features/pom.xml
index 995a768ee3638d6ff380a52e121150a88b4c1d86..e4405cb3df3acb779829957ee5b5b56f80b7a7c1 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -24,6 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
     <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
+    <mdsalutil.version>0.0.1-SNAPSHOT</mdsalutil.version>
     <vpnmanager.version>0.0.1-SNAPSHOT</vpnmanager.version>
     <interfacemgr.version>0.0.1-SNAPSHOT</interfacemgr.version>
     <nexthopmgr.version>0.0.1-SNAPSHOT</nexthopmgr.version>
@@ -86,6 +87,22 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <version>${vpnmanager.version}</version>
       <classifier>config</classifier>
       <type>xml</type>
+    </dependency><dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mdsalutil-impl</artifactId>
+      <version>${mdsalutil.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mdsalutil-impl</artifactId>
+      <version>${mdsalutil.version}</version>
+      <classifier>config</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mdsalutil-api</artifactId>
+      <version>${mdsalutil.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 5045cbea2b1c81b4aa2942db90f93b0a79ae721a..d87ef722a1bceefb59bbe5e3f630d410bf1c3564 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -18,7 +18,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${yangtools.version}'>odl-yangtools-models</feature>
     <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
     <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-api/${vpnmanager.version}</bundle>
+        <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-api/${vpnmanager.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/nexthopmgr-api/${nexthopmgr.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/idmanager-api/${idmanager.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/fibmanager-api/${fibmanager.version}</bundle>
@@ -29,6 +29,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${project.version}'>odl-vpnservice-api</feature>
     <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-api/${project.version}</bundle>
        <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-impl/${project.version}</bundle>
+       <bundle>mvn:org.opendaylight.vpnservice/mdsalutil-api/${interfacemgr.version}</bundle>
+       <bundle>mvn:org.opendaylight.vpnservice/mdsalutil-impl/${interfacemgr.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-impl/${vpnmanager.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/interfacemgr-api/${interfacemgr.version}</bundle>
     <bundle>mvn:org.opendaylight.vpnservice/interfacemgr-impl/${interfacemgr.version}</bundle>
@@ -40,6 +42,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
     <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
        <configfile finalname="bgpmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/bgpmanager-impl/${project.version}/xml/config</configfile>
+       <configfile finalname="mdsalutil-impl-default-config.xml">mvn:org.opendaylight.vpnservice/mdsalutil-impl/${interfacemgr.version}/xml/config</configfile>
     <configfile finalname="vpnmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/vpnmanager-impl/${vpnmanager.version}/xml/config</configfile>
     <configfile finalname="interfacemgr-impl-default-config.xml">mvn:org.opendaylight.vpnservice/interfacemgr-impl/${interfacemgr.version}/xml/config</configfile>
     <configfile finalname="nexthopmgr-impl-default-config.xml">mvn:org.opendaylight.vpnservice/nexthopmgr-impl/${nexthopmgr.version}/xml/config</configfile>

diff --git a/mdsalutil/mdsalutil-api/pom.xml b/mdsalutil/mdsalutil-api/pom.xml
index 6e68dd5c18d870b740f7bfffbf0e019829193beb..c8d18d40918fe019d33b8195dc70290e1c21b319 100644 (file)
--- a/mdsalutil/mdsalutil-api/pom.xml
+++ b/mdsalutil/mdsalutil-api/pom.xml
@@ -15,8 +15,14 @@
     <version>0.0.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
+    <properties>
+    <!-- ODL -->
+    <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
+     </properties>
+  
     <build>
         <plugins>
+        <!--
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
@@ -28,25 +34,70 @@
                             org.opendaylight.vpnservice.mdsalutil,
                             org.opendaylight.vpnservice.mdsalutil.interfaces
                         </Export-Package>
-                        <!--Import-Package>
+                        <Import-Package>
                             com.google.common.*,
                             org.opendaylight.yang.*,
                             org.opendaylight.yangtools.*,
                             org.opendaylight.controller.sal.binding.api.*,
                             org.opendaylight.controller.md.sal.common.api.*,
                             org.opendaylight.controller.sal.common
-                         </Import-Package-->
+                         </Import-Package
                     </instructions>
                     <manifestLocation>${project.basedir}/META-INF</manifestLocation>
                 </configuration>
             </plugin>
+            -->
+            <plugin>
+                   <groupId>org.opendaylight.yangtools</groupId>
+                   <artifactId>yang-maven-plugin</artifactId>
+                   <executions>
+                     <execution>
+                       <goals>
+                         <goal>generate-sources</goal>
+                       </goals>
+                       <configuration>
+                         <codeGenerators>
+                           <generator>
+                             <codeGeneratorClass>org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                             <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                           </generator>
+                           <generator>
+                             <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                             <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                             <additionalConfiguration>
+                               <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                             </additionalConfiguration>
+                           </generator>
+                           <generator>
+                             <codeGeneratorClass>org.opendaylight.yangtools.yang.unified.doc.generator.maven.DocumentationGeneratorImpl</codeGeneratorClass>
+                             <outputBaseDir>target/site/models</outputBaseDir>
+                           </generator>
+                         </codeGenerators>
+                         <inspectDependencies>true</inspectDependencies>
+                       </configuration>
+                     </execution>
+                   </executions>
+      </plugin>
         </plugins>
     </build>
     <dependencies>
+    <dependency>
+                <groupId>org.opendaylight.openflowplugin.model</groupId>
+                <artifactId>model-flow-base</artifactId>
+                <version>${openflowplugin.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.openflowplugin.model</groupId>
+                <artifactId>model-flow-service</artifactId>
+                <version>${openflowplugin.version}</version>
+        </dependency>
+        <!--
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
         </dependency>
+        -->
+         <!-- removed due to missing constraint
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-service</artifactId>
@@ -55,24 +106,31 @@
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-base</artifactId>
         </dependency>
+        -->
        <!--  <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-management</artifactId>
-        </dependency>-->
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
+        -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-statistics</artifactId>
         </dependency>
-        <!--
+        
         <dependency>
             <groupId>org.opendaylight.controller.adsal</groupId>
             <artifactId>sal</artifactId>
         </dependency>
         -->
+        <dependency>
+                   <groupId>org.opendaylight.controller</groupId>
+                   <artifactId>config-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common</artifactId>
@@ -81,11 +139,12 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <!--
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-topology</artifactId>
         </dependency>
-       
+       -->
                      
     </dependencies>
 </project>

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MDSALUtil.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MDSALUtil.java
index bcaf558cd81906a2b40af70cdc9d611ec5d9b34e..81cfd10df62b9de38c6974e42e66da932332dd08 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MDSALUtil.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/MDSALUtil.java
@@ -24,16 +24,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInputBuilder;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInput;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetFlowStatisticsFromFlowTableInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowModFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Instructions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.InstructionsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsInputBuilder;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsInput;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.GetGroupStatisticsInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.BucketId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
@@ -184,6 +184,8 @@ public class MDSALUtil {
                 .setGroupName(groupName).setResyncFlag(isResync).build();
     }
 */
+    // Removing --Missing Constraint
+    /*
     public static GetFlowStatisticsFromFlowTableInput buildGetFlowStatisticsFromFlowTableInput(short tableId,
             List<MatchInfo> listMatchInfo, long dpnId) {
         return new GetFlowStatisticsFromFlowTableInputBuilder()
@@ -202,6 +204,7 @@ public class MDSALUtil {
                         new NodeRef(InstanceIdentifier.builder(Nodes.class)
                                 .child(Node.class, new NodeKey(new NodeId("openflow:" + dpnId))).toInstance())).build();
     }
+    */
 
     public static TransmitPacketInput getPacketOutDefault(List<ActionInfo> actionInfos, byte[] payload, long dpnId) {
         return new TransmitPacketInputBuilder()

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/interfaces/IMdsalApiManager.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/interfaces/IMdsalApiManager.java
index f3de364e428544400c0cfb046066b1a0c2482acc..1ab2c54a0df41c678bdb2824576a5121a33d58e7 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/interfaces/IMdsalApiManager.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/vpnservice/mdsalutil/interfaces/IMdsalApiManager.java
@@ -31,5 +31,7 @@ public interface IMdsalApiManager {
     public void sendPacketOutWithActions(long lDpnId, long groupId, byte[] payload, List<ActionInfo> actionInfos);
 
     public void sendARPPacketOutWithActions(long dpid, byte[] payload, List<ActionInfo> action_info);
+    
+    public void printTest() ;
 
  }

diff --git a/mdsalutil/mdsalutil-api/src/main/yang/odl-mdsalutil.yang b/mdsalutil/mdsalutil-api/src/main/yang/odl-mdsalutil.yang
new file mode 100644 (file)
index 0000000..2fa19b1
--- /dev/null
+++ b/mdsalutil/mdsalutil-api/src/main/yang/odl-mdsalutil.yang
@@ -0,0 +1,20 @@
+module odl-mdsalutil {
+       yang-version 1;
+    namespace "urn:opendaylight:params:xml:ns:yang:mdsalutil:api";
+    prefix "odl-mdsal";
+
+    import config { prefix config; revision-date 2013-04-05; }
+ 
+    description
+        "Service definition for MD-SAL Util.";
+ 
+    revision "2015-04-10" {
+        description
+            "Initial revision";
+    }
+
+    identity odl-mdsalutil {
+        base "config:service-type";
+        config:java-class "org.opendaylight.vpnservice.mdsalutil.interfaces.IMdsalApiManager";
+    }
+}
\ No newline at end of file

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 1fa0775d2b67ffa242df2d34a7276cb8dcc90a69..049d293fa35dc1de584ffd2061c521772324d19a 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -23,21 +23,25 @@
             <artifactId>sal-binding-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-service</artifactId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-base</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller.model</groupId>
-            <artifactId>model-flow-base</artifactId>
+            <groupId>org.opendaylight.openflowplugin.model</groupId>
+            <artifactId>model-flow-service</artifactId>
+            <version>0.1.0-SNAPSHOT</version>
         </dependency>
         <!--<dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-flow-management</artifactId>
         </dependency>-->
+        <!-- Commenting due to missing constraint error
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>
             <artifactId>model-inventory</artifactId>
         </dependency>
+        -->
         <!--<dependency>
             <groupId>org.eclipse.xtend</groupId>
             <artifactId>org.eclipse.xtend.lib</artifactId>

diff --git a/mdsalutil/mdsalutil-impl/src/main/config/default-config.xml b/mdsalutil/mdsalutil-impl/src/main/config/default-config.xml
index 2d687c9c8c82a5df94e44d959ad55bc9c64dfbda..86121446b57dec73c61f3360aee015ce969ee79e 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/config/default-config.xml
+++ b/mdsalutil/mdsalutil-impl/src/main/config/default-config.xml
@@ -9,6 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
+      <capability>urn:opendaylight:params:xml:ns:yang:mdsalutil:api?module=odl-mdsalutil&amp;revision=2015-04-10</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:mdsalutil:impl?module=mdsalutil-impl&amp;revision=2015-04-03</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
   </required-capabilities>
@@ -25,6 +26,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           </broker>
         </module>
       </modules>
+         <services xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+            <service>
+              <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:mdsalutil:api">prefix:odl-mdsalutil</type>
+                <instance>
+                   <name>mdsalutil-service</name>
+                     <provider>/modules/module[type='mdsalutil-impl'][name='mdsalutil-default']</provider>
+                </instance>
+             </service> 
+         </services>
     </data>
   </configuration>
 </snapshot>

diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java
index 4c4cf0536257fe904abb876726ea339f30ed32de..00119d417cc3edd1fc8f89654cad9bed3203c760 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java
+++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/vpnservice/mdsalutil/internal/MDSALManager.java
@@ -40,7 +40,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.ta
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.FlowKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.FlowTableRef;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
+// Missing constraint
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.transaction.rev131103.TransactionId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowRef;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group;
@@ -79,37 +80,25 @@ public class MDSALManager implements IMdsalApiManager,BindingAwareConsumer, Auto
 
     private DataBroker m_dataBroker;
 
-    // TODO: CHECK IF RQD
-    
     private ConsumerContext m_consumerContext = null;
-    
-    // TODO Remove this later
-    private DataBrokerService m_dataBrokerService;
-    
+       
     private PacketProcessingService m_packetProcessingService;
-
       
     private final AtomicInteger m_atomicInteger = new AtomicInteger();
 
     //TODO : IF ID MANAGER IS RQD
     
-    public void setDataProvider(final DataBroker salDataProvider) {
-        this.m_dataBroker = salDataProvider;
-        
-    }
-    
-
     @Override
     public void onSessionInitialized(ConsumerContext session) {
        
-       s_logger.debug( " Session Initiated for MD SAL Manager") ;
+       s_logger.info( " Session Initiated for MD SAL Manager") ;
        
         m_consumerContext = session;
         
        m_dataBroker = session.getSALService(DataBroker.class);
               
         // TODO - Verify this.
-       // m_packetProcessingService = session.getRpcService(PacketProcessingService.class);
+       m_packetProcessingService = session.getRpcService(PacketProcessingService.class);
             
     }
     
@@ -119,7 +108,11 @@ public class MDSALManager implements IMdsalApiManager,BindingAwareConsumer, Auto
        s_logger.info("MDSAL Manager Closed");
     }
     
-    
+    @Override
+    public void printTest() {
+       
+       s_logger.info(" INTER MODULECOMMUNICATION IS WORKING!!!!");
+    }
     @Override
     public void installFlow(FlowEntity flowEntity) {
         try {

diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/mdsalutil/impl/rev150403/MdsaluttilimplModule.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/mdsalutil/impl/rev150403/MdsaluttilimplModule.java
index 9bfb8d6eedb2c4f2ee7ac7bc0a02cb6a18a04bfd..ab2776d75fd8ab197250a5197ede492e81234a13 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/mdsalutil/impl/rev150403/MdsaluttilimplModule.java
+++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/mdsalutil/impl/rev150403/MdsaluttilimplModule.java
@@ -1,4 +1,7 @@
 package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.impl.rev150403;
+
+import org.opendaylight.vpnservice.mdsalutil.internal.MDSALManager;
+
 public class MdsaluttilimplModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.impl.rev150403.AbstractMdsaluttilimplModule {
     public MdsaluttilimplModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
         super(identifier, dependencyResolver);
@@ -15,8 +18,14 @@ public class MdsaluttilimplModule extends org.opendaylight.yang.gen.v1.urn.opend
 
     @Override
     public java.lang.AutoCloseable createInstance() {
-        // TODO:implement
-        throw new java.lang.UnsupportedOperationException();
-    }
+       // TODO:implement
+//      Can use the following to get a handle to data broker
+       
+        MDSALManager mdsalUtilMgr = new MDSALManager();
+        getBrokerDependency().registerConsumer(mdsalUtilMgr);
+       //DataBroker dataBrokerService = getDataBrokerDependency();
+       //mdsalUtilMgr.setDataProvider(dataBrokerService);
+        return mdsalUtilMgr ;
+      }
 
 }

diff --git a/mdsalutil/mdsalutil-impl/src/main/yang/mdsalutil-impl.yang b/mdsalutil/mdsalutil-impl/src/main/yang/mdsalutil-impl.yang
index d94f5a1ff6e0fc825117e9342afdd606e59bc9f2..7e2a66f4af9a9884aff7bf06526e9d6095297880 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/yang/mdsalutil-impl.yang
+++ b/mdsalutil/mdsalutil-impl/src/main/yang/mdsalutil-impl.yang
@@ -5,6 +5,7 @@ module mdsalutil-impl {
 
     import config { prefix config; revision-date 2013-04-05; }
     import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;}
+    import odl-mdsalutil { prefix odl-mdsal; revision-date 2015-04-10;}
 
     description
         "Service definition for mdsal project";
@@ -15,8 +16,9 @@ module mdsalutil-impl {
     }
 
     identity mdsalutil-impl {
-        base config:module-type;
-        config:java-name-prefix mdsaluttilimpl;
+       base config:module-type;
+       config:provided-service odl-mdsal:odl-mdsalutil;
+       config:java-name-prefix Mdsaluttilimpl;
     }
 
     augment "/config:modules/config:module/config:configuration" {

diff --git a/pom.xml b/pom.xml
index dacac321e4cd2fe00fad99d1d112909b89a36cd8..22e07fb4e52314b65cc1cf030ecd5fd71ab0392e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -17,12 +17,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   </prerequisites>
   <modules>
        <module>model-bgp</module>
+       <module>mdsalutil</module>
     <module>vpnmanager</module>
     <module>interfacemgr</module>
     <module>nexthopmgr</module>
     <module>idmanager</module>
     <module>fibmanager</module>
-    <module>mdsalutil</module>
     <module>bgpmanager</module>
     <module>distribution/karaf</module>
     <module>features</module>