Fix incorrect OVSDB class names

OVSDB should be "Ovsdb" in Camel Case.
This patch fixes some mis-Camelizations

Change-Id: I70fa37e59ccfadbf9e28001cb18197e9c69dc19c
Signed-off-by: Dave Tucker <djt@redhat.com>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
index db0395e65bfe3b5daa74301b10d95fab36bf6592..c7752677771be83389227df95351fc597efe92b6 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
@@ -39,7 +39,7 @@ import org.opendaylight.ovsdb.lib.OvsdbConnectionInfo;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.plugin.Connection;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.plugin.StatusWithUuid;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
@@ -60,7 +60,7 @@ public class OvsdbPluginIT extends OvsdbIntegrationTestBase {
     private Logger log = LoggerFactory.getLogger(OvsdbPluginIT.class);
     @Inject
     private BundleContext bc;
-    private OVSDBConfigService ovsdbConfigService = null;
+    private OvsdbConfigService ovsdbConfigService = null;
     private Node node = null;
     private OvsdbClient client = null;
 
@@ -125,7 +125,7 @@ public class OvsdbPluginIT extends OvsdbIntegrationTestBase {
         } catch (Exception e) {
             fail("Exception : "+e.getMessage());
         }
-        this.ovsdbConfigService = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        this.ovsdbConfigService = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
     }
 
     @Test

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
similarity index 73%
rename from library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java
rename to library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
index c1a43647012a18be85b0a52a2e15b85fbbc8c9ad..210ec652291bef7d6ae8a6a6c48b4538de064c16 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBMap.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbMap.java
@@ -12,7 +12,7 @@ package org.opendaylight.ovsdb.lib.notation;
 import java.util.Map;
 
 import org.opendaylight.ovsdb.lib.notation.json.Converter;
-import org.opendaylight.ovsdb.lib.notation.json.OvsDBMapSerializer;
+import org.opendaylight.ovsdb.lib.notation.json.OvsdbMapSerializer;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -20,16 +20,16 @@ import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.Maps;
 
 @JsonDeserialize(converter = Converter.MapConverter.class)
-@JsonSerialize(using = OvsDBMapSerializer.class)
-public class OvsDBMap<K, V> extends ForwardingMap<K, V> {
+@JsonSerialize(using = OvsdbMapSerializer.class)
+public class OvsdbMap<K, V> extends ForwardingMap<K, V> {
 
     Map<K, V> target = Maps.newHashMap();
 
-    public OvsDBMap() {
+    public OvsdbMap() {
         this(Maps.<K,V>newHashMap());
     }
 
-    public OvsDBMap(Map<K, V> value) {
+    public OvsdbMap(Map<K, V> value) {
         this.target = value;
     }
 
@@ -38,7 +38,7 @@ public class OvsDBMap<K, V> extends ForwardingMap<K, V> {
         return target;
     }
 
-    public static<K,V> OvsDBMap<K,V> fromMap(Map<K, V> value) {
-        return new OvsDBMap<K,V>(value);
+    public static<K,V> OvsdbMap<K,V> fromMap(Map<K, V> value) {
+        return new OvsdbMap<K,V>(value);
     }
 }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBSet.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
similarity index 73%
rename from library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBSet.java
rename to library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
index 3a5892a1486ccc50373903d83635060c321fc632..03d12285c079cdff7a377314b4cc68953c92056a 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsDBSet.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/OvsdbSet.java
@@ -15,21 +15,21 @@ import com.google.common.collect.ForwardingSet;
 import com.google.common.collect.Sets;
 
 import org.opendaylight.ovsdb.lib.notation.json.Converter;
-import org.opendaylight.ovsdb.lib.notation.json.OvsDBSetSerializer;
+import org.opendaylight.ovsdb.lib.notation.json.OvsdbSetSerializer;
 
 import java.util.Set;
 
 @JsonDeserialize(converter = Converter.SetConverter.class)
-@JsonSerialize(using = OvsDBSetSerializer.class)
-public class OvsDBSet<T> extends ForwardingSet<T> {
+@JsonSerialize(using = OvsdbSetSerializer.class)
+public class OvsdbSet<T> extends ForwardingSet<T> {
 
     Set<T> target = null;
 
-    public OvsDBSet() {
+    public OvsdbSet() {
         this(Sets.<T>newHashSet());
     }
 
-    public OvsDBSet(Set<T> backing) {
+    public OvsdbSet(Set<T> backing) {
        this.target = backing;
     }
 
@@ -38,7 +38,7 @@ public class OvsDBSet<T> extends ForwardingSet<T> {
         return target;
     }
 
-    public static<D> OvsDBSet<D> fromSet(Set<D> value) {
-        return new OvsDBSet<>(value);
+    public static<D> OvsdbSet<D> fromSet(Set<D> value) {
+        return new OvsdbSet<>(value);
     }
 }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/Converter.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/Converter.java
index e94af9114f72db52ece309188e414d1f177bcec7..463f9579914e4a0c90de504fa8ea804d461fb9a8 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/Converter.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/Converter.java
@@ -11,8 +11,8 @@ package org.opendaylight.ovsdb.lib.notation.json;
 
 import org.opendaylight.ovsdb.lib.message.TableUpdates;
 import org.opendaylight.ovsdb.lib.message.UpdateNotification;
-import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbMap;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
@@ -27,16 +27,16 @@ public class Converter {
     static SetDeser setDeser = new SetDeser();
     static UpdateNotificationDeser unDeser = new UpdateNotificationDeser();
 
-    public static class MapConverter extends StdConverter<JsonNode, OvsDBMap<Object, Object>> {
+    public static class MapConverter extends StdConverter<JsonNode, OvsdbMap<Object, Object>> {
         @Override
-        public OvsDBMap<Object, Object> convert(JsonNode value) {
+        public OvsdbMap<Object, Object> convert(JsonNode value) {
             return mapDeser.deserialize(value);
         }
     }
 
-    public static class SetConverter extends StdConverter<JsonNode, OvsDBSet<Object>> {
+    public static class SetConverter extends StdConverter<JsonNode, OvsdbSet<Object>> {
         @Override
-        public OvsDBSet<Object> convert(JsonNode value) {
+        public OvsdbSet<Object> convert(JsonNode value) {
             return setDeser.deserialize(value);
         }
     }
@@ -49,11 +49,11 @@ public class Converter {
     }
 
     static class MapDeser {
-        public OvsDBMap<Object, Object> deserialize(JsonNode node) {
+        public OvsdbMap<Object, Object> deserialize(JsonNode node) {
             if (node.isArray()) {
                 if (node.size() == 2) {
                     if (node.get(0).isTextual() && "map".equals(node.get(0).asText())) {
-                        OvsDBMap<Object, Object> map = new OvsDBMap<Object, Object>();
+                        OvsdbMap<Object, Object> map = new OvsdbMap<Object, Object>();
                         for (JsonNode pairNode : node.get(1)) {
                             if (pairNode.isArray() && node.size() == 2) {
                                 Object key = atomDeser.deserialize(pairNode.get(0));
@@ -72,8 +72,8 @@ public class Converter {
     }
 
     static class SetDeser {
-        public OvsDBSet<Object> deserialize(JsonNode node) {
-            OvsDBSet<Object> set = new OvsDBSet<Object>();
+        public OvsdbSet<Object> deserialize(JsonNode node) {
+            OvsdbSet<Object> set = new OvsdbSet<Object>();
             if (node.isArray()) {
                 if (node.size() == 2) {
                     if (node.get(0).isTextual() && "set".equals(node.get(0).asText())) {

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBMapSerializer.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbMapSerializer.java
similarity index 87%
rename from library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBMapSerializer.java
rename to library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbMapSerializer.java
index 7bbc1203fcfb34c646d42da3aa813a67d1bbe355..b584fa47ea2e495138738c0f769126f2844ce59e 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBMapSerializer.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbMapSerializer.java
@@ -11,16 +11,16 @@ package org.opendaylight.ovsdb.lib.notation.json;
 
 import java.io.IOException;
 import java.util.Map;
-import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
+import org.opendaylight.ovsdb.lib.notation.OvsdbMap;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
-public class OvsDBMapSerializer extends JsonSerializer<OvsDBMap<?,?>> {
+public class OvsdbMapSerializer extends JsonSerializer<OvsdbMap<?,?>> {
     @Override
-    public void serialize(OvsDBMap<?,?> map, JsonGenerator generator,
+    public void serialize(OvsdbMap<?,?> map, JsonGenerator generator,
         SerializerProvider provider) throws IOException,
             JsonProcessingException {
         generator.writeStartArray();

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbSetSerializer.java
similarity index 85%
rename from library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java
rename to library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbSetSerializer.java
index 1d73d214646eb5b52ccb33b0074b581b07a6fee3..5e8c6000666ceab93ff41e9703416049a19cb56f 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsDBSetSerializer.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbSetSerializer.java
@@ -12,16 +12,16 @@ package org.opendaylight.ovsdb.lib.notation.json;
 import java.io.IOException;
 import java.util.Set;
 
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 
-public class OvsDBSetSerializer extends JsonSerializer<OvsDBSet<?>> {
+public class OvsdbSetSerializer extends JsonSerializer<OvsdbSet<?>> {
     @Override
-    public void serialize(OvsDBSet<?> set, JsonGenerator generator,
+    public void serialize(OvsdbSet<?> set, JsonGenerator generator,
         SerializerProvider provider) throws IOException,
             JsonProcessingException {
         generator.writeStartArray();

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OVSDBTypesIDResolver.java b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
similarity index 91%
rename from library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OVSDBTypesIDResolver.java
rename to library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
index 37962eb5aa1f5d7a73f789dc546c6c64e0933c9f..2829128230efd3c66c6a406742656d96c638e6d8 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OVSDBTypesIDResolver.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/notation/json/OvsdbTypesIdResolver.java
@@ -14,10 +14,10 @@ import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 
-public  class OVSDBTypesIDResolver implements TypeIdResolver {
+public  class OvsdbTypesIdResolver implements TypeIdResolver {
 
         private JavaType baseType;
 
@@ -44,7 +44,7 @@ public  class OVSDBTypesIDResolver implements TypeIdResolver {
         @Override
         public JavaType typeFromId(String id) {
             if ("set".equals(id)) {
-                return TypeFactory.defaultInstance().constructCollectionType(OvsDBSet.class, Object.class);
+                return TypeFactory.defaultInstance().constructCollectionType(OvsdbSet.class, Object.class);
             } else if ("uuid".equals(id) || "named-uuid".equals(id)) {
                 return TypeFactory.defaultInstance().constructType(UUID.class);
             }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java
index da960260424d8fe01fdb485ab39bcd462a933fc2..979f4fc3db8bc52bf2ff2536f4616f3bc9267a90 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnSchema.java
@@ -15,8 +15,8 @@ import java.util.Set;
 import org.opendaylight.ovsdb.lib.error.BadSchemaException;
 import org.opendaylight.ovsdb.lib.notation.Condition;
 import org.opendaylight.ovsdb.lib.notation.Function;
-import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbMap;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
@@ -109,9 +109,9 @@ public class ColumnSchema<E extends TableSchema<E>, D> {
     public Object getNormalizeData(D value) {
         Object untypedValue = null;
         if (value instanceof Set) {
-            untypedValue = OvsDBSet.fromSet((Set) value);
+            untypedValue = OvsdbSet.fromSet((Set) value);
         } else if (value instanceof Map) {
-            untypedValue = OvsDBMap.fromMap((Map)value);
+            untypedValue = OvsdbMap.fromMap((Map) value);
         } else {
             untypedValue = value;
         }

diff --git a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java
index a17414d256be8128faee52b552df605cd3d33b77..a047cd6d194082ea245589c6ad1c726f298b97be 100644 (file)
--- a/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java
+++ b/library/src/main/java/org/opendaylight/ovsdb/lib/schema/ColumnType.java
@@ -11,8 +11,8 @@ package org.opendaylight.ovsdb.lib.schema;
 
 import org.opendaylight.ovsdb.lib.error.TyperException;
 import org.opendaylight.ovsdb.lib.jsonrpc.JsonUtils;
-import org.opendaylight.ovsdb.lib.notation.OvsDBMap;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbMap;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
@@ -163,7 +163,7 @@ public abstract class ColumnType {
         @Override
         public Object valueFromJson(JsonNode value) {
             if (isMultiValued()) {
-                OvsDBSet<Object> result = new OvsDBSet<Object>();
+                OvsdbSet<Object> result = new OvsdbSet<Object>();
                 if(value.isArray()) {
                     if (value.size() == 2) {
                         if (value.get(0).isTextual() && "set".equals(value.get(0).asText())) {
@@ -235,7 +235,7 @@ public abstract class ColumnType {
             if (node.isArray()) {
                 if (node.size() == 2) {
                     if (node.get(0).isTextual() && "map".equals(node.get(0).asText())) {
-                        OvsDBMap<Object, Object> map = new OvsDBMap<Object, Object>();
+                        OvsdbMap<Object, Object> map = new OvsdbMap<Object, Object>();
                         for (JsonNode pairNode : node.get(1)) {
                             if (pairNode.isArray() && node.size() == 2) {
                                 Object key = getKeyType().toValue(pairNode.get(0));

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/Activator.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/Activator.java
index c814e0a715384effe7ef2bc664d9a375df231f42..bbc23951c6cc0c673161f4eae5d8e3ef93071620 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/Activator.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/Activator.java
@@ -29,8 +29,8 @@ import org.opendaylight.controller.switchmanager.IInventoryListener;
 import org.opendaylight.ovsdb.neutron.provider.IProviderNetworkManager;
 import org.opendaylight.ovsdb.neutron.provider.ProviderNetworkManager;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
-import org.opendaylight.ovsdb.plugin.OVSDBInventoryListener;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbInventoryListener;
 
 /**
  * OSGi bundle activator for the OVSDB Neutron Interface.
@@ -122,7 +122,7 @@ public class Activator extends ComponentActivatorAbstractBase {
         }
 
         if (imp.equals(SouthboundHandler.class)) {
-            c.setInterface(new String[] {OVSDBInventoryListener.class.getName(), IInventoryListener.class.getName()}, null);
+            c.setInterface(new String[] {OvsdbInventoryListener.class.getName(), IInventoryListener.class.getName()}, null);
             c.add(createServiceDependency().setService(IAdminConfigManager.class).setRequired(true));
             c.add(createServiceDependency().setService(IInternalNetworkManager.class).setRequired(true));
             c.add(createServiceDependency().setService(ITenantNetworkManager.class).setRequired(true));
@@ -153,7 +153,7 @@ public class Activator extends ComponentActivatorAbstractBase {
         //ToDo: DT: We don't need these dependencies for every implementation...
         //ToDo: DT: Callbacks are only required when behaviour is more complex than simple set/unset operation
         c.add(createServiceDependency().
-                setService(OVSDBConfigService.class).
+                setService(OvsdbConfigService.class).
                 setCallbacks("setOVSDBConfigService", "unsetOVSDBConfigService").
                 setRequired(true));
 

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java
index f6fccec6eb8c7c9568fcb497d7d0c0b540b23012..92d198bc90d4ab90abc8c504614a4f945221a8c2 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/AdminConfigManager.java
@@ -17,7 +17,7 @@ import java.util.Map;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -119,7 +119,7 @@ public class AdminConfigManager implements IAdminConfigManager{
     @Override
     public InetAddress getTunnelEndPoint(Node node) {
         InetAddress address = null;
-        OVSDBConfigService ovsdbConfig = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbConfig = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         try {
             Map<String, Row> ovsTable = ovsdbConfig.getRows(node, ovsdbConfig.getTableName(node, OpenVSwitch.class));
 
@@ -166,7 +166,7 @@ public class AdminConfigManager implements IAdminConfigManager{
     public String getPhysicalInterfaceName (Node node, String physicalNetwork) {
           String phyIf = null;
 
-          OVSDBConfigService ovsdbConfig = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+          OvsdbConfigService ovsdbConfig = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
           try {
             Map<String, Row> ovsTable = ovsdbConfig.getRows(node, ovsdbConfig.getTableName(node, OpenVSwitch.class));
 
@@ -229,7 +229,7 @@ public class AdminConfigManager implements IAdminConfigManager{
         List<String> phyIfName = new ArrayList<String>();
 
         try {
-            OVSDBConfigService ovsdbConfig = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbConfig = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> ovsTable = ovsdbConfig.getRows(node, ovsdbConfig.getTableName(node, OpenVSwitch.class));
 
             if (ovsTable == null) {

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
index 9bee8fa1570515550c9e18e0d8f14ef3376347fd..b4fb02a7547d6ea08c1d933cfc49f72d415e02e8 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/BaseHandler.java
@@ -22,7 +22,7 @@ import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -299,19 +299,19 @@ public class BaseHandler {
         this.frm = s;
     }
 
-    protected OVSDBConfigService ovsdbConfigService;
+    protected OvsdbConfigService ovsdbConfigService;
 
-    public OVSDBConfigService getOVSDBConfigService() {
+    public OvsdbConfigService getOVSDBConfigService() {
         return ovsdbConfigService;
     }
 
-    public void unsetOVSDBConfigService(OVSDBConfigService s) {
+    public void unsetOVSDBConfigService(OvsdbConfigService s) {
         if (s == this.ovsdbConfigService) {
             this.ovsdbConfigService = null;
         }
     }
 
-    public void setOVSDBConfigService(OVSDBConfigService s) {
+    public void setOVSDBConfigService(OvsdbConfigService s) {
         this.ovsdbConfigService = s;
     }
 

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
index a8490714ca7ad0ebc2abe7a93f877fe3f9ce216c..39464efb7bda1a2935f114675d4241601eda7b13 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/InternalNetworkManager.java
@@ -22,7 +22,7 @@ import org.opendaylight.controller.sal.utils.StatusCode;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.neutron.provider.IProviderNetworkManager;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.plugin.StatusWithUuid;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
@@ -53,7 +53,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
     @Override
     public String getInternalBridgeUUID (Node node, String bridgeName) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable == null) return null;
             for (String key : bridgeTable.keySet()) {
@@ -68,7 +68,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
 
     public Bridge getInternalBridge (Node node, String bridgeName) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable != null) {
                 for (String key : bridgeTable.keySet()) {
@@ -107,7 +107,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
 
     @Override
     public boolean isPortOnBridge (Node node, Bridge bridge, String portName) {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
         for (UUID portsUUID : bridge.getPortsColumn().getData()) {
             try {
@@ -351,7 +351,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
 
     private Status addPortToBridge (Node node, String bridgeName, String portName) throws Exception {
         logger.debug("addPortToBridge: Adding port: {} to Bridge {}, Node {}", portName, bridgeName, node);
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
         String bridgeUUID = this.getInternalBridgeUUID(node, bridgeName);
         if (bridgeUUID == null) {
@@ -409,7 +409,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
     }
 
     private Status addPatchPort (Node node, String bridgeUUID, String portName, String peerPortName) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
         logger.debug("addPatchPort: node: {}, bridgeUUID: {}, port: {}, peer: {}",
                 node, bridgeUUID, portName, peerPortName);
@@ -463,7 +463,7 @@ public class InternalNetworkManager implements IInternalNetworkManager {
     }
 
     private Status addInternalBridge (Node node, String bridgeName, String localPatchName, String remotePatchName) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
         String bridgeUUID = this.getInternalBridgeUUID(node, bridgeName);
         Bridge bridge = ovsdbTable.createTypedRow(node, Bridge.class);

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
index 296a2f5b7ec06cc7b45827d4f06c29ffa02ea402..b4c0d9fd79085a358cc27b789f116fef123ebcda 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
@@ -21,7 +21,7 @@ import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBInventoryListener;
+import org.opendaylight.ovsdb.plugin.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -139,7 +139,7 @@ public class NetworkHandler extends BaseHandler
         List <NeutronNetwork> networks = new ArrayList<NeutronNetwork>();
         if (neutronNetworkService != null) {
             networks = neutronNetworkService.getAllNetworks();
-            OVSDBInventoryListener inventoryListener = (OVSDBInventoryListener)ServiceHelper.getGlobalInstance(OVSDBInventoryListener.class, this);
+            OvsdbInventoryListener inventoryListener = (OvsdbInventoryListener)ServiceHelper.getGlobalInstance(OvsdbInventoryListener.class, this);
             if (networks.isEmpty()) {
                 logger.trace("neutronNetworkDeleted: last tenant network, delete tunnel ports...");
                 IConnectionServiceInternal connectionService = (IConnectionServiceInternal)

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
index af7ec20b2e57a7b9d20c00c27e534fe7c4b5fa57..b82e5c4beef77af5c06ca10652cf7acc792b60e5 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
@@ -21,7 +21,7 @@ import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
 import org.slf4j.Logger;
@@ -46,7 +46,7 @@ public class NodeConfiguration {
     private void initializeNodeConfiguration(Node node) {
         int vlan = 0;
         String networkId = new String();
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
         try {
             Map<String, Row> portRows = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Port.class));

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/PortHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/PortHandler.java
index 4287167a3cbba10b9617c8188fa8ab1605d86e5a..fde721f46605369cb132cc29e84d50f14f789eec 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/PortHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/PortHandler.java
@@ -22,7 +22,7 @@ import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBInventoryListener;
+import org.opendaylight.ovsdb.plugin.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -132,7 +132,7 @@ public class PortHandler extends BaseHandler
         IConnectionServiceInternal connectionService = (IConnectionServiceInternal)ServiceHelper.getGlobalInstance(IConnectionServiceInternal.class, this);
         INeutronNetworkCRUD neutronNetworkService = (INeutronNetworkCRUD)ServiceHelper.getGlobalInstance(INeutronNetworkCRUD.class, this);
         NeutronNetwork neutronNetwork = neutronNetworkService.getNetwork(port.getNetworkUUID());
-        OVSDBInventoryListener inventoryListener = (OVSDBInventoryListener)ServiceHelper.getGlobalInstance(OVSDBInventoryListener.class, this);
+        OvsdbInventoryListener inventoryListener = (OvsdbInventoryListener)ServiceHelper.getGlobalInstance(OvsdbInventoryListener.class, this);
         List<Node> nodes = connectionService.getNodes();
         for (Node node : nodes) {
             try {

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
index 4751efc173358c8b76fa1d60fc8d7f0886fb4071..a8a4adc49fd3ab21ed6c0c9c989fe6b5b5f1f976 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/SouthboundHandler.java
@@ -28,14 +28,14 @@ import org.opendaylight.controller.switchmanager.IInventoryListener;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.neutron.provider.IProviderNetworkManager;
-import org.opendaylight.ovsdb.plugin.OVSDBInventoryListener;
+import org.opendaylight.ovsdb.plugin.OvsdbInventoryListener;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class SouthboundHandler extends BaseHandler implements OVSDBInventoryListener, IInventoryListener {
+public class SouthboundHandler extends BaseHandler implements OvsdbInventoryListener, IInventoryListener {
     static final Logger logger = LoggerFactory.getLogger(SouthboundHandler.class);
     //private Thread eventThread;
     private ExecutorService eventHandler;

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
index 60c2d5f055b11a10148268bcb812962046139bf8..fc7aa2b164e98d42e1147bb6aa506c3c74cd16e5 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
@@ -28,12 +28,12 @@ import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.utils.HexEncode;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.controller.sal.utils.Status;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.neutron.provider.IProviderNetworkManager;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
@@ -123,7 +123,7 @@ public class TenantNetworkManager implements ITenantNetworkManager {
 
     private String getNodeUUID(Node node) {
         String nodeUuid = new String();
-        OVSDBConfigService ovsdbConfigService = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbConfigService = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         try {
             Map<String, Row> ovsTable = ovsdbConfigService.getRows(node, ovsdbConfigService.getTableName(node, OpenVSwitch.class));
             nodeUuid = (String)ovsTable.keySet().toArray()[0];
@@ -206,7 +206,7 @@ public class TenantNetworkManager implements ITenantNetworkManager {
                 return false;
             }
         }
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         try {
             /*
             // Vlan Tag based identification
@@ -316,9 +316,9 @@ public class TenantNetworkManager implements ITenantNetworkManager {
             logger.error("Unable to get an internalVlan for Network {}", network);
             return;
         }
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         Port port = ovsdbTable.createTypedRow(node, Port.class);
-        OvsDBSet<Long> tags = new OvsDBSet<Long>();
+        OvsdbSet<Long> tags = new OvsdbSet<Long>();
         tags.add(Long.valueOf(vlan));
         port.setTag(tags);
         ovsdbTable.updateRow(node, port.getSchema().getName(), null, portUUID, port.getRow());
@@ -331,7 +331,7 @@ public class TenantNetworkManager implements ITenantNetworkManager {
             logger.error("ContainerManager is not accessible");
             return;
         }
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         try {
             Row portRow = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Port.class), portUUID);
             Port port = ovsdbTable.getTypedRow(node, Port.class, portRow);
@@ -387,7 +387,7 @@ public class TenantNetworkManager implements ITenantNetworkManager {
     }
 
     private Bridge getBridgeIdForPort (Node node, String uuid) {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         try {
             Map<String, Row> bridges = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridges == null) return null;

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
index b31b2d1e39cca038d68e5df48e915b89be51f0fe..47898fb5ac7023def2f6089f6e96ede1e93e4f54 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
@@ -35,7 +35,7 @@ import org.opendaylight.ovsdb.neutron.IInternalNetworkManager;
 import org.opendaylight.ovsdb.neutron.ITenantNetworkManager;
 import org.opendaylight.ovsdb.neutron.NetworkHandler;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.plugin.StatusWithUuid;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
@@ -112,7 +112,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -144,7 +144,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -175,7 +175,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -210,7 +210,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -239,7 +239,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -294,7 +294,7 @@ public class OF10Provider implements NetworkProvider {
             return;
         }
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brNetId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -348,7 +348,7 @@ public class OF10Provider implements NetworkProvider {
 
         long patchOFPort = -1;
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> intfs = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Interface.class));
             if (intfs != null) {
                 for (Row row : intfs.values()) {
@@ -424,7 +424,7 @@ public class OF10Provider implements NetworkProvider {
 
         long patchOFPort = -1;
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> intfs = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Interface.class));
             if (intfs != null) {
                 for (Row row : intfs.values()) {
@@ -583,7 +583,7 @@ public class OF10Provider implements NetworkProvider {
     public long getOFPort (Node node, String portName) {
         long ofPort = -1;
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> intfs = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Interface.class));
             if (intfs != null) {
                 for (Row row : intfs.values()) {
@@ -689,7 +689,7 @@ public class OF10Provider implements NetworkProvider {
         }
 
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brUUID);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -855,7 +855,7 @@ public class OF10Provider implements NetworkProvider {
 
     private Interface getTunnelInterface (Node node, String tunnelType, InetAddress dst, String key) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             String portName = getTunnelName(tunnelType, key, dst);
 
             Map<String, Row> tunIntfs = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Interface.class));
@@ -873,7 +873,7 @@ public class OF10Provider implements NetworkProvider {
     }
 
     private boolean isTunnelPresent(Node node, String tunnelName, String bridgeUUID) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), bridgeUUID);
         Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
         if (bridge != null) {
@@ -888,7 +888,7 @@ public class OF10Provider implements NetworkProvider {
     }
 
     private String getPortUuid(Node node, String portName, String bridgeUUID) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), bridgeUUID);
         Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
         if (bridge != null) {
@@ -906,7 +906,7 @@ public class OF10Provider implements NetworkProvider {
         try {
             String bridgeUUID = null;
             String tunnelBridgeName = adminConfigManager.getNetworkBridgeName();
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable != null) {
                 for (String uuid : bridgeTable.keySet()) {
@@ -979,7 +979,7 @@ public class OF10Provider implements NetworkProvider {
     private Status deletePort(Node node, String bridgeName, String portName) {
         try {
             String bridgeUUID = null;
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable != null) {
                 for (String uuid : bridgeTable.keySet()) {
@@ -1053,7 +1053,7 @@ public class OF10Provider implements NetworkProvider {
         }
 
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row row = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), brIntId);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, row);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -1138,7 +1138,7 @@ public class OF10Provider implements NetworkProvider {
 
     private String getInternalBridgeUUID (Node node, String bridgeName) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable == null) return null;
             for (String key : bridgeTable.keySet()) {

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
index 450efd17693bfe2269c9414323311fea659d65ec..50d505f01f4c8e33220d5e1e799e22ff348094a7 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
@@ -36,7 +36,7 @@ import org.opendaylight.ovsdb.neutron.IMDSALConsumer;
 import org.opendaylight.ovsdb.neutron.ITenantNetworkManager;
 import org.opendaylight.ovsdb.neutron.NetworkHandler;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.plugin.StatusWithUuid;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
@@ -184,7 +184,7 @@ public class OF13Provider implements NetworkProvider {
     }
 
     private boolean isTunnelPresent(Node node, String tunnelName, String bridgeUUID) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         Row bridgeRow = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), bridgeUUID);
         Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, bridgeRow);
         if (bridge != null) {
@@ -199,7 +199,7 @@ public class OF13Provider implements NetworkProvider {
     }
 
     private String getPortUuid(Node node, String name, String bridgeUUID) throws Exception {
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
         Row bridgeRow = ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), bridgeUUID);
         Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, bridgeRow);
         if (bridge != null) {
@@ -217,7 +217,7 @@ public class OF13Provider implements NetworkProvider {
         try {
             String bridgeUUID = null;
             String tunnelBridgeName = adminConfigManager.getIntegrationBridgeName();
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable != null) {
                 for (String uuid : bridgeTable.keySet()) {
@@ -291,7 +291,7 @@ public class OF13Provider implements NetworkProvider {
     private Status deletePort(Node node, String bridgeName, String portName) {
         try {
             String bridgeUUID = null;
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable != null) {
                 for (String uuid : bridgeTable.keySet()) {
@@ -761,7 +761,7 @@ public class OF13Provider implements NetworkProvider {
    }
     private Long getDpid (Node node, String bridgeUuid) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Row bridgeRow =  ovsdbTable.getRow(node, ovsdbTable.getTableName(node, Bridge.class), bridgeUuid);
             Bridge bridge = ovsdbTable.getTypedRow(node, Bridge.class, bridgeRow);
             Set<String> dpids = bridge.getDatapathIdColumn().getData();
@@ -896,7 +896,7 @@ public class OF13Provider implements NetworkProvider {
                 logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
             Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
@@ -960,7 +960,7 @@ public class OF13Provider implements NetworkProvider {
                 logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
             Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
@@ -1024,7 +1024,7 @@ public class OF13Provider implements NetworkProvider {
                 logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
             Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             int timeout = 6;
@@ -1105,7 +1105,7 @@ public class OF13Provider implements NetworkProvider {
                 logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
                 return;
             }
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService) ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
 
             Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
@@ -1187,7 +1187,7 @@ public class OF13Provider implements NetworkProvider {
 
     private Status triggerInterfaceUpdates(Node node) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> intfs = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Interface.class));
             if (intfs != null) {
                 for (Row row : intfs.values()) {
@@ -4041,7 +4041,7 @@ public class OF13Provider implements NetworkProvider {
 
     private String getInternalBridgeUUID (Node node, String bridgeName) {
         try {
-            OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
+            OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class, this);
             Map<String, Row> bridgeTable = ovsdbTable.getRows(node, ovsdbTable.getTableName(node, Bridge.class));
             if (bridgeTable == null) return null;
             for (String key : bridgeTable.keySet()) {

diff --git a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
index f1e9ad8547e4ba55575719cb6b6c0799fc309b04..1bc909b633206945b616efc671ad329c9c56a5fd 100644 (file)
--- a/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
+++ b/neutron/src/test/java/org/opendaylight/ovsdb/neutron/AdminConfigManagerTest.java
@@ -35,7 +35,7 @@ import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.plugin.ConfigurationService;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
@@ -47,7 +47,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 public class AdminConfigManagerTest {
 
     AdminConfigManager adminConfigManager;
-    private OVSDBConfigService ovsdbConfig;
+    private OvsdbConfigService ovsdbConfig;
     private Node node;
     private OpenVSwitch ovsTable;
     private ConcurrentMap<String, Row> ovsMap;
@@ -71,7 +71,7 @@ public class AdminConfigManagerTest {
         node = mock(Node.class);
         ovsdbConfig = mock(ConfigurationService.class);
         PowerMockito.mockStatic(ServiceHelper.class);
-        when(ServiceHelper.getGlobalInstance(eq(OVSDBConfigService.class), anyObject())).thenReturn(ovsdbConfig);
+        when(ServiceHelper.getGlobalInstance(eq(OvsdbConfigService.class), anyObject())).thenReturn(ovsdbConfig);
 
         ovsTable = PowerMockito.mock(OpenVSwitch.class);
         ovsMap = new ConcurrentHashMap<>();
@@ -92,12 +92,12 @@ public class AdminConfigManagerTest {
         ovsTable.setOtherConfig(localIp);
         ovsMap.put("OpenVSwitch", ovsTable.getRow());
 
-        OVSDBConfigService ovsdbConfig = mock(ConfigurationService.class);
+        OvsdbConfigService ovsdbConfig = mock(ConfigurationService.class);
         when(ovsdbConfig.getRows(any(Node.class), anyString())).thenReturn(null)
                                                                .thenReturn(ovsMap);
 
         PowerMockito.mockStatic(ServiceHelper.class);
-        when(ServiceHelper.getGlobalInstance(eq(OVSDBConfigService.class), anyObject())).thenReturn(ovsdbConfig);
+        when(ServiceHelper.getGlobalInstance(eq(OvsdbConfigService.class), anyObject())).thenReturn(ovsdbConfig);
 
         // OVSDBConfigService is null
         assertEquals(null, adminConfigManager.getTunnelEndPoint(mockNode));
@@ -129,11 +129,11 @@ public class AdminConfigManagerTest {
         ovsMap.put("1", ovsRow1.getRow());
         ovsMap.put("2", ovsRow2.getRow());
 
-        OVSDBConfigService ovsdbConfig = mock(ConfigurationService.class);
+        OvsdbConfigService ovsdbConfig = mock(ConfigurationService.class);
         when(ovsdbConfig.getRows(any(Node.class), anyString())).thenReturn(ovsMap);
 
         PowerMockito.mockStatic(ServiceHelper.class);
-        when(ServiceHelper.getGlobalInstance(eq(OVSDBConfigService.class), anyObject())).thenReturn(ovsdbConfig);
+        when(ServiceHelper.getGlobalInstance(eq(OvsdbConfigService.class), anyObject())).thenReturn(ovsdbConfig);
 
         // Success...
         assertEquals(testAddress, adminConfigManager.getTunnelEndPoint(mockNode));

diff --git a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV2.java b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV2.java
index 97d6076e845f9a8cb18f825e00133423315dae6c..0cc60695e52efde604cb539a7a3ecc061db76373 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV2.java
+++ b/northbound/src/main/java/org/opendaylight/ovsdb/northbound/OvsdbNorthboundV2.java
@@ -45,7 +45,7 @@ import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 import org.opendaylight.ovsdb.plugin.Connection;
 import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
-import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
+import org.opendaylight.ovsdb.plugin.OvsdbConfigService;
 import org.opendaylight.ovsdb.plugin.OvsVswitchdSchemaConstants;
 import org.opendaylight.ovsdb.plugin.StatusWithUuid;
 import org.slf4j.Logger;
@@ -324,7 +324,7 @@ public class OvsdbNorthboundV2 {
             throw new UnauthorizedException("User is not authorized to perform this operation");
         }
 
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class,
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class,
                                                                                             this);
         if (ovsdbTable == null) {
             throw new ServiceUnavailableException("OVS Configuration Service " + RestMessages.SERVICEUNAVAILABLE.toString());
@@ -414,7 +414,7 @@ public class OvsdbNorthboundV2 {
             throw new UnauthorizedException("User is not authorized to perform this operation");
         }
 
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class,
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class,
                                                                                             this);
         if (ovsdbTable == null) {
             throw new ServiceUnavailableException("UserManager " + RestMessages.SERVICEUNAVAILABLE.toString());
@@ -496,7 +496,7 @@ public class OvsdbNorthboundV2 {
             throw new UnauthorizedException("User is not authorized to perform this operation");
         }
 
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class,
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class,
                                                                                             this);
         if (ovsdbTable == null) {
             throw new ServiceUnavailableException("UserManager " + RestMessages.SERVICEUNAVAILABLE.toString());
@@ -570,7 +570,7 @@ public class OvsdbNorthboundV2 {
             throw new UnauthorizedException("User is not authorized to perform this operation");
         }
 
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class,
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class,
                                                                                             this);
         if (ovsdbTable == null) {
             throw new ServiceUnavailableException("OVS Configuration Service " + RestMessages.SERVICEUNAVAILABLE.toString());
@@ -650,7 +650,7 @@ public class OvsdbNorthboundV2 {
             throw new UnauthorizedException("User is not authorized to perform this operation");
         }
 
-        OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class,
+        OvsdbConfigService ovsdbTable = (OvsdbConfigService)ServiceHelper.getGlobalInstance(OvsdbConfigService.class,
                 this);
         if (ovsdbTable == null) {
             throw new ServiceUnavailableException("OVS Configuration Service " + RestMessages.SERVICEUNAVAILABLE.toString());

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
index 6207331484e0d97a96b9eedf236c17e994e3c92a..36f414db0746e546fa99c5c19a2e89d3324bf487 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java
@@ -74,7 +74,7 @@ public class Activator extends ComponentActivatorAbstractBase {
             // by SAL
             props.put(GlobalConstants.PROTOCOLPLUGINTYPE.toString(), "OVS");
             c.setInterface(new String[] { IPluginInBridgeDomainConfigService.class.getName(),
-                                          OVSDBConfigService.class.getName()}, props);
+                                          OvsdbConfigService.class.getName()}, props);
 
             c.add(createServiceDependency()
                     .setService(IConnectionServiceInternal.class)
@@ -123,7 +123,7 @@ public class Activator extends ComponentActivatorAbstractBase {
                             "unsetPluginOutInventoryServices")
                     .setRequired(true));
             c.add(createServiceDependency()
-                    .setService(OVSDBConfigService.class)
+                    .setService(OvsdbConfigService.class)
                     .setCallbacks("setConfigurationService", "unsetConfigurationService")
                     .setRequired(false));
         }

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index 2677c8491ebb3c62facd509cb2167484d1ef0a5f..5b01d94cbff944793e313116cdb8bcf4568d29a5 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -35,7 +35,7 @@ import org.opendaylight.controller.sal.utils.StatusCode;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
 import org.opendaylight.ovsdb.lib.notation.Column;
 import org.opendaylight.ovsdb.lib.notation.Mutator;
-import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
+import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
 import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.notation.UUID;
 import org.opendaylight.ovsdb.lib.operations.Insert;
@@ -61,7 +61,7 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 
-public class ConfigurationService implements IPluginInBridgeDomainConfigService, OVSDBConfigService,
+public class ConfigurationService implements IPluginInBridgeDomainConfigService, OvsdbConfigService,
                                              CommandProvider
 {
     private static final Logger logger = LoggerFactory
@@ -471,7 +471,7 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
             return false;
         }
 
-        OvsDBSet<String> protocols = new OvsDBSet<String>();
+        OvsdbSet<String> protocols = new OvsdbSet<String>();
 
         String ofVersion = System.getProperty("ovsdb.of.version", OPENFLOW_10);
         switch (ofVersion) {

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
index 0240c7a484727313ab47a785848b21ae6998477e..66a59b7eeef9eeeca75e02750a029d4b14d08617 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
@@ -56,7 +56,7 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
     private ConcurrentMap<NodeConnector, Map<String, Property>> nodeConnectorProps = new ConcurrentHashMap<NodeConnector, Map<String, Property>>();
     private ConcurrentMap<Node, NodeDB> dbCache = Maps.newConcurrentMap();
     private ScheduledExecutorService executor;
-    private OVSDBConfigService configurationService;
+    private OvsdbConfigService configurationService;
 
     /**
      * Function called by the dependency manager when all the required
@@ -104,11 +104,11 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
             this.pluginOutInventoryServices.remove(service);
     }
 
-    public void setConfigurationService(OVSDBConfigService service) {
+    public void setConfigurationService(OvsdbConfigService service) {
         configurationService = service;
     }
 
-    public void unsetConfigurationService(OVSDBConfigService service) {
+    public void unsetConfigurationService(OvsdbConfigService service) {
         configurationService = null;
     }
 
@@ -171,7 +171,7 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
             dbCache.put(n, db);
         }
 
-        OVSDBInventoryListener inventoryListener = (OVSDBInventoryListener)ServiceHelper.getGlobalInstance(OVSDBInventoryListener.class, this);
+        OvsdbInventoryListener inventoryListener = (OvsdbInventoryListener)ServiceHelper.getGlobalInstance(OvsdbInventoryListener.class, this);
         for (String tableName : tableUpdates.getUpdates().keySet()) {
             Map<String, Row> tCache = db.getTableCache(databaseName, tableName);
             TableUpdate update = tableUpdates.getUpdates().get(tableName);
@@ -261,7 +261,7 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
 
     @Override
     public void notifyNodeAdded(Node node) {
-        OVSDBInventoryListener inventoryListener = (OVSDBInventoryListener)ServiceHelper.getGlobalInstance(OVSDBInventoryListener.class, this);
+        OvsdbInventoryListener inventoryListener = (OvsdbInventoryListener)ServiceHelper.getGlobalInstance(OvsdbInventoryListener.class, this);
         if (inventoryListener != null) {
             inventoryListener.nodeAdded(node);
         }
@@ -282,7 +282,7 @@ public class InventoryService implements IPluginInInventoryService, InventorySer
 
     @Override
     public void removeNode(Node node) {
-        OVSDBInventoryListener inventoryListener = (OVSDBInventoryListener)ServiceHelper.getGlobalInstance(OVSDBInventoryListener.class, this);
+        OvsdbInventoryListener inventoryListener = (OvsdbInventoryListener)ServiceHelper.getGlobalInstance(OvsdbInventoryListener.class, this);
         if (inventoryListener != null) {
             inventoryListener.nodeRemoved(node);
         }

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBConfigService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbConfigService.java
similarity index 99%
rename from plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBConfigService.java
rename to plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbConfigService.java
index c84f855d0085316a3d30f869056d7719fb0c76e5..38afce540b33f013bcec918ad4785155c589fa4f 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBConfigService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbConfigService.java
@@ -19,7 +19,7 @@ import org.opendaylight.ovsdb.lib.notation.Row;
 import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
 import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
 
-public interface OVSDBConfigService {
+public interface OvsdbConfigService {
 
     /**
      * This version of insertRow is a short-term replacement for the older & now deprecated method of the same name.

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBInventoryListener.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbInventoryListener.java
similarity index 94%
rename from plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBInventoryListener.java
rename to plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbInventoryListener.java
index dffbef1e196ff81c9ba05d725424d2bfd590675d..37a738f968824617b74b8f4cfa3305d7429eeffe 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OVSDBInventoryListener.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbInventoryListener.java
@@ -12,7 +12,7 @@ package org.opendaylight.ovsdb.plugin;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.ovsdb.lib.notation.Row;
 
-public interface OVSDBInventoryListener {
+public interface OvsdbInventoryListener {
     public void nodeAdded(Node node);
     public void nodeRemoved(Node node);
     public void rowAdded(Node node, String tableName, String uuid, Row row);