Don't proxy ARP with the private gateway MAC address for public network.

Change-Id: Ice16a39cc9fe349e22f61131d24f898744a765db

@@ -548,16 +548,23 @@ public class CordVtn extends AbstractProvider implements CordVtnService, HostPro
             return;
             return;
         }
         }
 
 
-        if (service.serviceType().equals(CordService.ServiceType.MANAGEMENT)) {
+        switch (service.serviceType()) {
+            case MANAGEMENT:
                 ruleInstaller.populateManagementNetworkRules(host, service);
                 ruleInstaller.populateManagementNetworkRules(host, service);
-        } else {
+                break;
+            case PRIVATE:
+            case PRIVATE_INDIRECT:
+            case PRIVATE_DIRECT:
+                arpProxy.addGateway(service.serviceIp(), privateGatewayMac);
+            case PUBLIC_INDIRECT:
+            case PUBLIC_DIRECT:
+            default:
                 // TODO check if the service needs an update on its group buckets after done CORD-433
                 // TODO check if the service needs an update on its group buckets after done CORD-433
                 ruleInstaller.updateServiceGroup(service);
                 ruleInstaller.updateServiceGroup(service);
-            arpProxy.addGateway(service.serviceIp(), privateGatewayMac);
-
                 // sends gratuitous ARP here for the case of adding existing VMs
                 // sends gratuitous ARP here for the case of adding existing VMs
                 // when ONOS or cordvtn app is restarted
                 // when ONOS or cordvtn app is restarted
                 arpProxy.sendGratuitousArpForGateway(service.serviceIp(), Sets.newHashSet(host));
                 arpProxy.sendGratuitousArpForGateway(service.serviceIp(), Sets.newHashSet(host));
+                break;
         }
         }
 
 
         registerDhcpLease(host, service);
         registerDhcpLease(host, service);
@@ -616,15 +623,22 @@ public class CordVtn extends AbstractProvider implements CordVtnService, HostPro
             return;
             return;
         }
         }
 
 
-        if (service.serviceType().equals(CordService.ServiceType.MANAGEMENT)) {
+        switch (service.serviceType()) {
+            case MANAGEMENT:
                 ruleInstaller.removeManagementNetworkRules(host, service);
                 ruleInstaller.removeManagementNetworkRules(host, service);
-        } else {
-            // TODO check if the service needs an update on its group buckets after done CORD-433
-            ruleInstaller.updateServiceGroup(service);
-
+                break;
+            case PRIVATE:
+            case PRIVATE_INDIRECT:
+            case PRIVATE_DIRECT:
                 if (getHostsWithOpenstackNetwork(vNet).isEmpty()) {
                 if (getHostsWithOpenstackNetwork(vNet).isEmpty()) {
                     arpProxy.removeGateway(service.serviceIp());
                     arpProxy.removeGateway(service.serviceIp());
                 }
                 }
+            case PUBLIC_INDIRECT:
+            case PUBLIC_DIRECT:
+            default:
+                // TODO check if the service needs an update on its group buckets after done CORD-433
+                ruleInstaller.updateServiceGroup(service);
+                break;
         }
         }
     }
     }