Remove unrelated source changes

Author: Dogface2k

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

@@ -1096,7 +1096,7 @@ public Integer getNetworkRate(long networkId, Long vmId) {
             }
         }
         if (ntwkOff != null) {
-            return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), network.getDataCenterId());
+            return _configMgr.getServiceOfferingNetworkRate(ntwkOff.getId(), network.getDataCenterId());
         }
         final Integer networkRate = NetworkOrchestrationService.NetworkThrottlingRate.valueIn(network.getDataCenterId());
         if (networkRate != null && networkRate > 0) {
@@ -2353,7 +2353,7 @@ public boolean start() {
      */
     protected void addDisabledConfigDriveEntriesOnZone(DataCenterVO zone) {
         if (zone.getNetworkType() == DataCenter.NetworkType.Advanced) {
-            List<PhysicalNetworkVO> physicalNetworks = _physicalNetworkDao.listByZoneAndTrafficType(
+            List<PhysicalNetworkVO> physicalNetworks = _pNSPDao.listByZoneAndTrafficType(
                     zone.getId(), TrafficType.Guest);
             for (PhysicalNetworkVO physicalNetworkVO : physicalNetworks) {
                 PhysicalNetworkServiceProviderVO provider = _pNSPDao.findByServiceProvider(
@@ -2488,7 +2488,7 @@ public void checkRequestedIpAddresses(long networkId, IpAddresses ips) throws In
         }
         if (mac != null) {
             if(!NetUtils.isValidMac(mac)) {
-                throw new InvalidParameterValueException("Invalid specified Mac address " + mac);
+                throw new InvalidParameterValueException("Invalid specified MAC address " + mac);
             }
             if (_nicDao.findByNetworkIdAndMacAddress(networkId, mac) != null) {
                 throw new InvalidParameterValueException("The requested Mac address is already taken! " + mac);
@@ -2831,7 +2831,7 @@ public boolean checkSecurityGroupSupportForNetwork(Account account, DataCenter z
             }
         } else if (CollectionUtils.isNotEmpty(securityGroupsIds)) {
             Network networkWithSecurityGroup = getNetworkWithSGWithFreeIPs(account, zone.getId());
-            return networkWithSGWithFreeIPs(account, zone.getId()) != null;
+            return networkWithSecurityGroup != null;
         }
         return false;
     }