SG: Apply rules for both ipv4/ipv6 of VMs with associated account/SG

engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java

@@ -50,6 +50,9 @@ public class SecurityGroupVMMapVO implements InternalIdentity {
     @Column(name = "ip4_address", table = "nics", insertable = false, updatable = false)
     private String guestIpAddress;
 
+    @Column(name = "ip6_address", table = "nics", insertable = false, updatable = false)
+    private String guestIpv6Address;
+
     @Column(name = "state", table = "vm_instance", insertable = false, updatable = false)
     private State vmState;
 
@@ -77,6 +80,10 @@ public String getGuestIpAddress() {
         return guestIpAddress;
     }
 
+    public String getGuestIpv6Address() {
+        return guestIpv6Address;
+    }
+
     public long getInstanceId() {
         return instanceId;
     }

server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java

@@ -354,6 +354,9 @@ protected Map<PortAndProto, Set<String>> generateRulesForVM(Long userVmId, Secur
                             String cidr = defaultNic.getIPv4Address();
                             cidr = cidr + "/32";
                             cidrs.add(cidr);
+                            if (defaultNic.getIPv6Address() != null) {
+                                cidrs.add(defaultNic.getIPv6Address() + "/64");
+                            }
                         }
                     }
                 } else if (rule.getAllowedSourceIpCidr() != null) {

server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java

@@ -250,6 +250,9 @@ protected Map<PortAndProto, Set<String>> generateRulesForVM(Long userVmId, Secur
                         //did a join with the nics table
                         String cidr = ngmapVO.getGuestIpAddress() + "/32";
                         cidrs.add(cidr);
+                        if (ngmapVO.getGuestIpv6Address() != null) {
+                            cidrs.add(ngmapVO.getGuestIpv6Address() + "/64");
+                        }
                     }
                 } else if (rule.getAllowedSourceIpCidr() != null) {
                     cidrs.add(rule.getAllowedSourceIpCidr());