Merge "BUG #4026 neutron spi: make NeutronObject implements INeutronObject"

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallDummyProvider.java
index d5084901e59013e090e13c30892d7f986405f410,ee6861a9877c67abd17193292509b8cc89ccd0a0..1c479c4fcf4164ee32f19d2d91525397213c33bb
--- 1/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallDummyProvider.java
--- 2/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallDummyProvider.java
+++ b/dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallDummyProvider.java
@@@ -42,8 -42,8 +42,8 @@@ public class NeutronFirewallDummyProvid
      public int canDeleteNeutronFirewall(NeutronFirewall firewall) {
          return(HttpURLConnection.HTTP_OK);
      }
 -  
 +
      public void neutronFirewallDeleted(NeutronFirewall firewall) {
-         LOGGER.info(firewall.getFirewallUUID()+" deleted");
+         LOGGER.info(firewall.getID()+" deleted");
      }
  }

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallPolicyDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronFirewallRuleDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronLoadBalancerDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronLoadBalancerHealthMonitorDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronLoadBalancerListenerDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronLoadBalancerPoolDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronMeteringLabelDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronMeteringLabelRuleDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronSecurityGroupDummyProvider.java
Simple merge

diff --cc dummyprovider/src/main/java/org/opendaylight/neutron/dummyprovider/NeutronSecurityRuleDummyProvider.java
Simple merge

diff --cc neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIP.java
Simple merge

diff --cc neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
Simple merge

diff --cc neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
Simple merge

diff --cc neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
Simple merge

diff --cc neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallPolicyNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronFirewallRulesNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerHealthMonitorNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerListenerNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolMembersNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronLoadBalancerPoolNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelRulesNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronMeteringLabelsNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityGroupsNorthbound.java
Simple merge

diff --cc northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronSecurityRulesNorthbound.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractNeutronInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronMeteringLabelRuleInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
Simple merge

diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
Simple merge