Allow users of all types to create L2 networks

Author: Dingane Hlaluku

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

@@ -1117,8 +1117,8 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
         }
 
         // Only Admin can create Shared networks
-        if ((ntwkOff.getGuestType() == GuestType.Shared || ntwkOff.getGuestType() == GuestType.L2) && !_accountMgr.isAdmin(caller.getId())) {
-            throw new InvalidParameterValueException("Only Admins can create network with guest type " + GuestType.Shared + " or " + GuestType.L2);
+        if ((ntwkOff.getGuestType() == GuestType.Shared) && !_accountMgr.isAdmin(caller.getId())) {
+            throw new InvalidParameterValueException("Only Admins can create network with guest type " + GuestType.Shared);
         }
 
         // Check if the network is domain specific
@@ -1824,13 +1824,15 @@ public boolean deleteNetwork(long networkId, boolean forced) {
 
         // don't allow to delete system network
         if (isNetworkSystem(network)) {
+            assert network != null;
             throwInvalidIdException("Network with specified id is system and can't be removed", network.getUuid(), "networkId");
         }
 
+        assert network != null;
         Account owner = _accountMgr.getAccount(network.getAccountId());
 
-        // Only Admin can delete Shared and L2 networks
-        if ((network.getGuestType() == GuestType.Shared || network.getGuestType() == GuestType.L2) && !_accountMgr.isAdmin(caller.getId())) {
+        // Only Admin can delete Shared
+        if ((network.getGuestType() == GuestType.Shared) && !_accountMgr.isAdmin(caller.getId())) {
             throw new InvalidParameterValueException("Only Admins can delete network with guest type " + network.getGuestType());
         }
 

ui/scripts/network.js

@@ -795,7 +795,7 @@
                             isHeader: true
                         }),
 
-                        rootAdminAddL2Network: $.extend({}, addL2GuestNetwork.def, {
+                        AddL2Network: $.extend({}, addL2GuestNetwork.def, {
                             isHeader: true
                         })
 

ui/scripts/sharedFunctions.js

@@ -831,13 +831,6 @@ var addL2GuestNetwork = {
             }
         },
 
-        preFilter: function(args) {
-            if (isAdmin())
-                return true;
-            else
-                return false;
-        },
-
         createForm: {
             title: 'label.add.l2.guest.network',
             fields: {