Move Usage network event publishing methods to UsageEventUtils

Author: winterhazel

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java

@@ -348,10 +348,4 @@ void implementNetworkElementsAndResources(DeployDestination dest, ReservationCon
     Pair<NicProfile, Integer> importNic(final String macAddress, int deviceId, final Network network, final Boolean isDefaultNic, final VirtualMachine vm, final Network.IpAddresses ipAddresses, final DataCenter datacenter, boolean forced) throws InsufficientVirtualNetworkCapacityException, InsufficientAddressCapacityException;
 
     void unmanageNics(VirtualMachineProfile vm);
-
-    void publishNetworkCreation(Network network);
-
-    void publishNetworkUpdate(Network network);
-
-    void publishNetworkDeletion(Network network);
 }

engine/components-api/src/main/java/com/cloud/event/UsageEventUtils.java

@@ -25,6 +25,7 @@
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
+import com.cloud.network.Network;
 import org.apache.commons.collections.MapUtils;
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -246,4 +247,22 @@ private static void publishUsageEvent(String usageEventType, Long accountId, Lon
 
     static final String Name = "management-server";
 
+    public static void publishNetworkCreation(Network network) {
+        publishUsageEvent(EventTypes.EVENT_NETWORK_CREATE, network.getAccountId(), network.getDataCenterId(),
+                network.getId(), network.getName(), network.getNetworkOfferingId(), null, null, null, network.getState().name(),
+                network.getUuid());
+    }
+
+    public static void publishNetworkUpdate(Network network) {
+        publishUsageEvent(EventTypes.EVENT_NETWORK_UPDATE, network.getAccountId(), network.getDataCenterId(),
+                network.getId(), network.getName(), network.getNetworkOfferingId(), null, network.getState().name(),
+                Network.class.getName(), network.getUuid(), true);
+    }
+
+    public static void publishNetworkDeletion(Network network) {
+        publishUsageEvent(EventTypes.EVENT_NETWORK_DELETE, network.getAccountId(), network.getDataCenterId(),
+                network.getId(), network.getName(), network.getNetworkOfferingId(), null, null, null,
+                Network.class.getName(), network.getUuid());
+    }
+
 }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -1520,7 +1520,7 @@ public Pair<NetworkGuru, NetworkVO> implementNetwork(final long networkId, final
 
             network.setRestartRequired(false);
             _networksDao.update(network.getId(), network);
-            publishNetworkUpdate(network);
+            UsageEventUtils.publishNetworkUpdate(network);
             implemented.set(guru, network);
             return implemented;
         } catch (final NoTransitionException e) {
@@ -3002,7 +3002,7 @@ public Network doInTransaction(final TransactionStatus status) {
                 if (updateResourceCount) {
                     _resourceLimitMgr.incrementResourceCount(owner.getId(), ResourceType.network, isDisplayNetworkEnabled);
                 }
-                publishNetworkCreation(network);
+                UsageEventUtils.publishNetworkCreation(network);
 
                 return network;
             }
@@ -3141,7 +3141,7 @@ public Boolean doInTransaction(final TransactionStatus status) {
                         _networksDao.update(networkFinal.getId(), networkFinal);
                         _networksDao.clearCheckForGc(networkId);
                         if (initialState == Network.State.Implemented) {
-                            publishNetworkUpdate(networkFinal);
+                            UsageEventUtils.publishNetworkUpdate(networkFinal);
                         }
                         result = true;
                     } else {
@@ -3395,7 +3395,7 @@ public List<VlanVO> doInTransaction(TransactionStatus status) {
                     final Pair<Class<?>, Long> networkMsg = new Pair<Class<?>, Long>(Network.class, networkFinal.getId());
                     _messageBus.publish(_name, EntityManager.MESSAGE_REMOVE_ENTITY_EVENT, PublishScope.LOCAL, networkMsg);
                 }
-                publishNetworkDeletion(network);
+                UsageEventUtils.publishNetworkDeletion(network);
                 return true;
             } catch (final CloudRuntimeException e) {
                 s_logger.error("Failed to delete network", e);
@@ -4781,27 +4781,6 @@ public void unmanageNics(VirtualMachineProfile vm) {
         }
     }
 
-    @Override
-    public void publishNetworkCreation(Network network) {
-        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_CREATE, network.getAccountId(), network.getDataCenterId(),
-                network.getId(), network.getName(), network.getNetworkOfferingId(), null, null, null, network.getState().name(),
-                network.getUuid());
-    }
-
-    @Override
-    public void publishNetworkUpdate(Network network) {
-        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_UPDATE, network.getAccountId(), network.getDataCenterId(),
-                network.getId(), network.getName(), network.getNetworkOfferingId(), null, network.getState().name(),
-                Network.class.getName(), network.getUuid(), true);
-    }
-
-    @Override
-    public void publishNetworkDeletion(Network network) {
-        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_DELETE, network.getAccountId(), network.getDataCenterId(),
-                network.getId(), network.getName(), network.getNetworkOfferingId(), null, null, null,
-                Network.class.getName(), network.getUuid());
-    }
-
     @Override
     public String getConfigComponentName() {
         return NetworkOrchestrationService.class.getSimpleName();

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -3393,7 +3393,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
             }
         }
         Network updatedNetwork = getNetwork(network.getId());
-        _networkMgr.publishNetworkUpdate(updatedNetwork);
+        UsageEventUtils.publishNetworkUpdate(updatedNetwork);
         return updatedNetwork;
     }
 

server/src/test/java/com/cloud/vpc/MockNetworkManagerImpl.java

@@ -1052,18 +1052,6 @@ public Pair<NicProfile, Integer> importNic(String macAddress, int deviceId, Netw
     public void unmanageNics(VirtualMachineProfile vm) {
     }
 
-    @Override
-    public void publishNetworkCreation(Network network) {
-    }
-
-    @Override
-    public void publishNetworkUpdate(Network network) {
-    }
-
-    @Override
-    public void publishNetworkDeletion(Network network) {
-    }
-
     @Override
     public Pair<List<? extends GuestVlan>, Integer> listGuestVlans(ListGuestVlansCmd cmd) {
         return null;