commit e6110b7b342d546fd2a575db7a974721f6465c3c
author Jian Li <pyguni@gmail.com> Fri Jul 06 19:06:36 2018 +0900
committer Jian Li <pyguni@gmail.com> Sun Jul 08 09:20:19 2018 +0000
tree 693717c3901ec6103ca6d0165819be2c7c89fec4
parent a51656db710777a5b51381c1347e24cfa895e0e2

Fix: resolve the service not found exception caused by openstack4j

Change-Id: I33a5c7e6b91758a61662a77a1b347fd0239219eb

apps/openstacktelemetry/api/BUCK

diff --git a/apps/openstacktelemetry/api/BUCK b/apps/openstacktelemetry/api/BUCK
index 40a119b..bd27fb6 100644
--- a/apps/openstacktelemetry/api/BUCK
+++ b/apps/openstacktelemetry/api/BUCK
@@ -1,12 +1,9 @@
-include_defs('//apps/openstacknode/openstack4j.bucklet')
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:kafka-clients',
     '//lib:jersey-client',
     '//lib:javax.ws.rs-api',
     '//lib:influxdb-java',
-    '//lib:openstack4j-core',
 ]
 
 TEST_DEPS = [
@@ -18,6 +15,4 @@
 osgi_jar_with_tests (
     deps = COMPILE_DEPS,
     test_deps = TEST_DEPS,
-
-    import_packages = INCLUDE_PACKAGES + ',' + EXCLUDE_PACKAGES  + ',' + ALL_PACKAGES,
 )

apps/openstacktelemetry/api/pom.xml

diff --git a/apps/openstacktelemetry/api/pom.xml b/apps/openstacktelemetry/api/pom.xml
index 4536492..9a9baf3 100644
--- a/apps/openstacktelemetry/api/pom.xml
+++ b/apps/openstacktelemetry/api/pom.xml
@@ -54,37 +54,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.pacesys</groupId>
-            <artifactId>openstack4j-core</artifactId>
-            <version>${openstack4j.version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.kafka-clients</artifactId>
             <version>${kafka-client.version}</version>
         </dependency>
 
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>
-                            ${project.groupId}.${project.artifactId}
-                        </Bundle-SymbolicName>
-                        <Import-Package>
-                            !org.openstack4j.*,
-                            *
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>

apps/openstacktelemetry/api/src/main/java/org/onosproject/openstacktelemetry/api/Constants.java

diff --git a/apps/openstacktelemetry/api/src/main/java/org/onosproject/openstacktelemetry/api/Constants.java b/apps/openstacktelemetry/api/src/main/java/org/onosproject/openstacktelemetry/api/Constants.java
index d06d3f2..20a4afa 100644
--- a/apps/openstacktelemetry/api/src/main/java/org/onosproject/openstacktelemetry/api/Constants.java
+++ b/apps/openstacktelemetry/api/src/main/java/org/onosproject/openstacktelemetry/api/Constants.java
@@ -65,4 +65,7 @@
     public static final boolean DEFAULT_DISABLE = false;
     public static final boolean DEFAULT_ENABLE = true;
 
+    public static final String VXLAN = "VXLAN";
+    public static final String VLAN = "VLAN";
+    public static final String FLAT = "FLAT";
 }