CLOUDSTACK-9074: Fix network orchestrator

Author: nvazquez

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

@@ -676,14 +676,9 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                                 finalizeServicesAndProvidersForNetwork(offering, plan.getPhysicalNetworkId()));
                         networks.add(networkPersisted);
 
-                        if (predefined instanceof NetworkVO){
-                            try{
-                                NetworkGuruAdditionalFunctions functions = (NetworkGuruAdditionalFunctions) guru;
-                                functions.finalizeNetworkDesign(networkPersisted.getId(), ((NetworkVO)predefined).getVlanIdAsUUID());
-                            }
-                            catch (Exception e){
-                                //Couldn't cast to NetworkGuruAdditionalFunctions, continue
-                            }
+                        if (predefined instanceof NetworkVO && guru instanceof NetworkGuruAdditionalFunctions){
+                            NetworkGuruAdditionalFunctions functions = (NetworkGuruAdditionalFunctions) guru;
+                            functions.finalizeNetworkDesign(networkPersisted.getId(), ((NetworkVO)predefined).getVlanIdAsUUID());
                         }
 
                         if (domainId != null && aclType == ACLType.Domain) {
@@ -1034,13 +1029,12 @@ public Pair<NetworkGuru, NetworkVO> implementNetwork(long networkId, DeployDesti
             s_logger.error(e.getMessage());
             return null;
         } catch (CloudRuntimeException e) {
-            s_logger.error("[NSX_PLUGIN_LOG] NetworkOrchestor caught exception " + e.getMessage() + " returning null");
+            s_logger.error("Caught exception: " + e.getMessage());
             return null;
         } finally {
             if (implemented.first() == null) {
                 s_logger.debug("Cleaning up because we're unable to implement the network " + network);
                 try {
-                    s_logger.info("[NSX_PLUGIN_LOG] isSharedNetworkWithServices? " + isSharedNetworkWithServices(network));
                     if (isSharedNetworkWithServices(network)) {
                         network.setState(Network.State.Shutdown);
                         _networksDao.update(networkId, network);