Merge changes I8490a721,I71941875

* changes:
  Bug 3166 ui-backend introduced
  Moved util methods from PolicyResolver

diff --combined commons/parent/pom.xml
index 7e441e58cebdd795a683f19cd9351192a693ea23,344b199449270321788cc0ab599af915ab65b904..d859cae995a45b8b7a993fe6001ffa7f4eb34cbc
--- 1/commons/parent/pom.xml
--- 2/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@@ -30,10 -30,10 +30,11 @@@
      <generated.yang.docs>${project.build.directory}/site/models</generated.yang.docs>
      <config.version>0.3.0-SNAPSHOT</config.version>
      <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
+     <restconf.version>1.2.0-SNAPSHOT</restconf.version>
      <yangtools.version>0.7.0-SNAPSHOT</yangtools.version>
      <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
      <neutron.version>0.5.0-SNAPSHOT</neutron.version>
 +    <ovsdb.southbound.version>1.1.0-SNAPSHOT</ovsdb.southbound.version>
    </properties>
  
    <dependencyManagement>
@@@ -59,6 -59,11 +60,11 @@@
          <artifactId>neutron-mapper</artifactId>
          <version>${project.version}</version>
        </dependency>
+       <dependency>
+         <groupId>org.opendaylight.groupbasedpolicy</groupId>
+         <artifactId>ui-backend</artifactId>
+         <version>${project.version}</version>
+       </dependency>
  
        <!-- Yangtools and Controller infrastructure -->
        <dependency>
@@@ -260,3 -265,4 +266,3 @@@
      <tag>HEAD</tag>
    </scm>
  </project>
 -

diff --combined features/pom.xml
index e7ee8e178fc9f4306b6bd1b74c4ee9b8effc89a1,117edf6fc3ce8a547c42d860e2d340665a3a499c..b203d0d6b036285a2ad9a17ce4c1c502c021c976
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -25,6 -25,7 +25,7 @@@
      <config.groupbasedpolicy.opflexconfigfile>15-groupbasedpolicy-opflex.xml</config.groupbasedpolicy.opflexconfigfile>
      <config.groupbasedpolicy.openstackendpointconfigfile>15-groupbasedpolicy-openstackendpoint.xml</config.groupbasedpolicy.openstackendpointconfigfile>
      <config.groupbasedpolicy.neutronmapperconfigfile>15-neutron-mapper.xml</config.groupbasedpolicy.neutronmapperconfigfile>
+     <config.groupbasedpolicy.uibackendconfigfile>15-ui-backend.xml</config.groupbasedpolicy.uibackendconfigfile>
    </properties>
  
    <dependencies>
@@@ -76,13 -77,6 +77,13 @@@
        <version>${neutron.version}</version>
        <type>xml</type>
      </dependency>
 +    <dependency>
 +      <groupId>org.opendaylight.ovsdb</groupId>
 +      <artifactId>southbound-features</artifactId>
 +      <version>${ovsdb.southbound.version}</version>
 +      <classifier>features</classifier>
 +      <type>xml</type>
 +    </dependency>
  
      <!-- gbp dependencies -->
      <dependency>
@@@ -101,6 -95,10 +102,10 @@@
        <groupId>org.opendaylight.groupbasedpolicy</groupId>
        <artifactId>neutron-mapper</artifactId>
      </dependency>
+     <dependency>
+       <groupId>org.opendaylight.groupbasedpolicy</groupId>
+       <artifactId>ui-backend</artifactId>
+     </dependency>
  
      <!-- gbp configuration dependencies -->
      <dependency>
@@@ -124,6 -122,13 +129,13 @@@
        <type>xml</type>
        <classifier>config</classifier>
      </dependency>
+     <dependency>
+       <groupId>org.opendaylight.groupbasedpolicy</groupId>
+       <artifactId>ui-backend-config</artifactId>
+       <version>${project.version}</version>
+       <type>xml</type>
+       <classifier>config</classifier>
+     </dependency>
  
      <!-- testing dependencies -->
      <dependency>
@@@ -220,3 -225,4 +232,3 @@@
      <url>https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=summary</url>
    </scm>
  </project>
 -

diff --combined features/src/main/resources/features.xml
index 4e4180d6836c378e0c731beb5ff1f5adc01ebac6,f38a307e3d1bbe538379810915db9e86fac99916..e16767b8ef2330578917bd520ab09eaeff421872
--- 1/features/src/main/resources/features.xml
--- 2/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@@ -18,11 -18,13 +18,14 @@@
      <!-- Repos needed by the OpenFlow Overlay renderer -->
      <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
      <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
 +    <repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.southbound.version}/xml/features</repository>
  
      <!-- Repos needed by the Neutron Mapper -->
      <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
  
+     <!-- Repos needed by the UI Backend -->
+     <repository>mvn:org.opendaylight.controller/features-restconf/${restconf.version}/xml/features</repository>
+ 
      <!-- The common GBP components -->
      <feature name='odl-groupbasedpolicy-base' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: Base Copmonents'>
          <feature version="${mdsal.version}">odl-mdsal-broker</feature>
@@@ -41,7 -43,6 +44,7 @@@
          <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
          <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
          <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
 +        <feature version='${ovsdb.southbound.version}'>odl-ovsdb-southbound-impl</feature>
          <bundle>mvn:org.opendaylight.groupbasedpolicy/ofoverlay-renderer/${project.version}</bundle>
          <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.ofoverlayconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-ofoverlay-config/${project.version}/xml/config</configfile>
      </feature>
@@@ -77,7 -78,6 +80,6 @@@
          <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.openstackendpointconfigfile}">mvn:org.opendaylight.groupbasedpolicy/groupbasedpolicy-openstackendpoint-config/${project.version}/xml/config</configfile>
      </feature>
  
- 
      <!--
           The Neutron provider
      -->
@@@ -89,4 -89,16 +91,15 @@@
          <bundle>mvn:org.opendaylight.groupbasedpolicy/neutron-mapper/${project.version}</bundle>
          <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.neutronmapperconfigfile}">mvn:org.opendaylight.groupbasedpolicy/neutron-mapper-config/${project.version}/xml/config</configfile>
      </feature>
+ 
+     <!--
+          The UI Backend
+     -->
+     <feature name='odl-groupbasedpolicy-uibackend' version='${project.version}' description='OpenDaylight :: groupbasedpolicy :: UI Backend provides APIs for UI '>
+         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
+         <feature version="${project.version}">odl-groupbasedpolicy-base</feature>
+         <feature version="${restconf.version}">odl-restconf</feature>
+         <bundle>mvn:org.opendaylight.groupbasedpolicy/ui-backend/${project.version}</bundle>
+         <configfile finalname="${config.configfile.directory}/${config.groupbasedpolicy.uibackendconfigfile}">mvn:org.opendaylight.groupbasedpolicy/ui-backend-config/${project.version}/xml/config</configfile>
+     </feature>
  </features>
 -