Merge pull request #413 from jschoiRR/mold-diplo

[Mold API] 보안그룹용 오퍼링 기본값 생성시 세팅 값 수정(빌드시 오류는 없으나 jetty 구동 시 시작불가 상태)

Author: jschoiRR

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

@@ -466,6 +466,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
         // populate providers
         final Map<Network.Service, Set<Network.Provider>> defaultSharedNetworkOfferingProviders = new HashMap<Network.Service, Set<Network.Provider>>();
         final Set<Network.Provider> defaultProviders = new HashSet<Network.Provider>();
+        final Set<Network.Provider> defaultSGProviders = new HashSet<Network.Provider>();
         final Set<Network.Provider> tungstenProvider = new HashSet<>();
 
         defaultProviders.add(Network.Provider.VirtualRouter);
@@ -485,10 +486,10 @@ public boolean configure(final String name, final Map<String, Object> params) th
         defaultIsolatedNetworkOfferingProviders.put(Service.Vpn, defaultProviders);
 
         final Map<Network.Service, Set<Network.Provider>> defaultSharedSGEnabledNetworkOfferingProviders = new HashMap<Network.Service, Set<Network.Provider>>();
-        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.Dhcp, defaultProviders);
-        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.Dns, defaultProviders);
-        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.UserData, defaultProviders);
-        final Set<Provider> sgProviders = new HashSet<Provider>();
+        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.Dhcp, defaultSGProviders);
+        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.Dns, defaultSGProviders);
+        defaultSharedSGEnabledNetworkOfferingProviders.put(Service.UserData, defaultSGProviders);
+        final Set<Network.Provider> sgProviders = new HashSet<>();
         sgProviders.add(Provider.SecurityGroupProvider);
         defaultSharedSGEnabledNetworkOfferingProviders.put(Service.SecurityGroup, sgProviders);
 
@@ -541,7 +542,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
 
                 //#2 - SG enabled network offering
                 if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOfferingWithSGService) == null && _networkOfferingDao.findByUniqueName("기본 공유 보안그룹 네트워크오퍼링") == null) {
-                    offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "기본 공유 보안그룹 네트워크오퍼링",
+                    offering = _configMgr.createNetworkOffering("기본 공유 보안그룹 네트워크오퍼링", "기본 공유 보안그룹 네트워크오퍼링",
                             TrafficType.Guest, null, true, Availability.Optional, null, defaultSharedSGEnabledNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true,
                             null, true, false, null, false, null, true, false, false, null, null, true, null);
                 }

server/src/main/java/com/cloud/server/ConfigurationServerImpl.java

@@ -1030,7 +1030,7 @@ protected void createDefaultNetworkOfferings() {
             public void doInTransactionWithoutResult(TransactionStatus status) {
                 // Offering #1
                 NetworkOfferingVO defaultSharedSGNetworkOffering =
-                        new NetworkOfferingVO(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "기본 공유 보안그룹 네트워크오퍼링",
+                        new NetworkOfferingVO("기본 공유 보안그룹 네트워크오퍼링", "기본 공유 보안그룹 네트워크오퍼링",
                                 TrafficType.Guest, false, true, null, null, true, Availability.Optional, null, Network.GuestType.Shared, true, true, false, false, false, false);
 
                 defaultSharedSGNetworkOffering.setState(NetworkOffering.State.Enabled);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4044,9 +4044,6 @@ private UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffe
             volumesSize += verifyAndGetDiskSize(diskOffering, diskSize);
         }
         UserVm vm = getCheckedUserVmResource(zone, hostName, displayName, owner, diskOfferingId, diskSize, networkList, securityGroupIdList, group, httpmethod, userData, userDataId, userDataDetails, sshKeyPairs, caller, requestedIps, defaultIps, isDisplayVm, keyboard, affinityGroupIdList, customParameters, customId, dhcpOptionMap, datadiskTemplateToDiskOfferringMap, userVmOVFPropertiesMap, dynamicScalingEnabled, vmType, template, hypervisorType, accountId, offering, isIso, rootDiskOfferingId, volumesSize);
-        if (! VirtualMachineManager.ResourceCountRunningVMsonly.value()) {
-            resourceLimitCheck(owner, isDisplayVm, offering.getCpu().longValue(), offering.getRamSize().longValue());
-        }
 
         _securityGroupMgr.addInstanceToGroups(vm.getId(), securityGroupIdList);