SecurityGroup 값에 따른 도메인 xml 의 Interface값 변경

Author: jschoiRR

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -3759,6 +3759,9 @@ private void createVif(final LibvirtVMDef vm, final VirtualMachineTO vmSpec, fin
             throw new InternalErrorException("LibvirtVMDef object get devices with null result");
         }
         final InterfaceDef interfaceDef = getVifDriver(nic.getType(), nic.getName()).plug(nic, vm.getPlatformEmulator(), nicAdapter, extraConfig);
+        if (!nic.isSecurityGroupEnabled()) {
+            interfaceDef.setFilterrefFilterTag();
+        }
         if (vmSpec.getDetails() != null) {
             setInterfaceDefQueueSettings(vmSpec.getDetails(), vmSpec.getCpus(), interfaceDef);
         }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -1455,6 +1455,7 @@ enum HostNicType {
         private Integer _userIp4Prefix;
         private Integer _multiQueueNumber;
         private Boolean _packedVirtQueues;
+        private Boolean _filterrefFilter = false;
 
         public void defBridgeNet(String brName, String targetBrName, String macAddr, NicModel model) {
             defBridgeNet(brName, targetBrName, macAddr, model, 0);
@@ -1651,6 +1652,10 @@ public void setPackedVirtQueues(Boolean packedVirtQueues) {
             this._packedVirtQueues = packedVirtQueues;
         }
 
+        public void setFilterrefFilterTag() {
+            this._filterrefFilter = true;
+        }
+
         public String getContent() {
             StringBuilder netBuilder = new StringBuilder();
             if (_netType == GuestNetType.BRIDGE) {
@@ -1726,7 +1731,9 @@ public String getContent() {
             if (StringUtils.isNotBlank(_userIp4Network) && _userIp4Prefix != null) {
                 netBuilder.append(String.format("<ip family='ipv4' address='%s' prefix='%s'/>\n", _userIp4Network, _userIp4Prefix));
             }
-            netBuilder.append("<filterref filter='allow-all-traffic'/>");
+            if (_filterrefFilter) {
+                netBuilder.append("<filterref filter='allow-all-traffic'/>");
+            }
             return netBuilder.toString();
         }