From 882ddc69b05a4001718d90aa9c57f1e13d80aa0d Mon Sep 17 00:00:00 2001
From: Varun Seereeram <vseereer@cisco.com>
Date: Thu, 4 Feb 2016 05:15:51 -0800
Subject: GUI initial commit

- open ui on http://controllerIp:8181/index.html
- added interfaces to vpp topo.
- fixed VPP mounting
- fixed VPP Editing and deleting

Change-Id: I6ae2c6e5781d3e0cdb78b112d706b9f5076301d5
Signed-off-by: Daniel Malachovsky <daniel.malachovsky@pantheon.sk>
Signed-off-by: Varun Seereeram <vseereer@cisco.com>
Signed-off-by: Robert Varga <nite@hq.sk>
---
 vbd/features/pom.xml                        | 5 +++++
 vbd/features/src/main/features/features.xml | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'vbd/features')

diff --git a/vbd/features/pom.xml b/vbd/features/pom.xml
index ec852ba82..e481750e4 100644
--- a/vbd/features/pom.xml
+++ b/vbd/features/pom.xml
@@ -131,5 +131,10 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>vbd-api</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vbd-ui-bundle</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/vbd/features/src/main/features/features.xml b/vbd/features/src/main/features/features.xml
index b47ee1b16..0f3d7c155 100644
--- a/vbd/features/src/main/features/features.xml
+++ b/vbd/features/src/main/features/features.xml
@@ -42,11 +42,14 @@
     <feature version="${restconf.version}">odl-restconf</feature>
   </feature>
 
-  <!--feature name='odl-vbd-ui' version='${project.version}' description='OpenDaylight :: vbd :: UI'>
+  <!-- FIXME: disabled until we find out why it fails to verify
+  <feature name='odl-vbd-ui' version='${project.version}' description='OpenDaylight :: vbd :: UI'>
     <feature version="${project.version}">odl-vbd-rest</feature>
     <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${mdsal.version}">odl-mdsal-xsql</feature>
+    <feature version="${restconf.version}">odl-mdsal-xsql</feature>
     <feature version="${dlux.version}">odl-dlux-yangui</feature>
-  </feature-->
+    <bundle>mvn:io.fd.honeycomb.vbd/vbd-ui-bundle/{{VERSION}}</bundle>
+  </feature>
+  -->
 
 </features>
-- 
cgit 1.2.3-korg