done set firewall name <name> rule <1-9999> source group address-group <name> #50

done set firewall name <name> rule <1-9999> destination group address-group <name> #51

vycontrol/firewall/templates/firewall/addrule.html

@@ -277,7 +277,7 @@
         <div class="row">
             <div class="col">
                 <p>
-                    <label for="sdaddressgroup_source">source address-group</label><br>
+                    <label for="sdaddressgroup_source">select at max one source address-group</label><br>
                     <select name="sdaddressgroup_source" size="10"  style="width: 200px;">
                         {% for f in firewall_addressgroup %}
                         <option>{{ f }}</option>
@@ -289,7 +289,7 @@
 
             <div class="col">
                 <p>
-                    <label for="sdaddressgroup_destination">destination address-group</label><br>
+                    <label for="sdaddressgroup_destination">select at max one destination address-group</label><br>
                     <select name="sdaddressgroup_destination" size="10" style="width: 200px;">
                         {% for f in firewall_addressgroup %}
                         <option>{{ f }}</option>
@@ -308,7 +308,7 @@
         <div class="row">
             <div class="col">
                 <p>
-                    <label for="sdnetworkgroup_source">source network-group</label><br>
+                    <label for="sdnetworkgroup_source">select at max one source network-group</label><br>
                     <select name="sdnetworkgroup_source" size="10" style="width: 200px;">
                         {% for f in firewall_networkgroup %}
                         <option>{{ f }}</option>
@@ -320,7 +320,7 @@
 
             <div class="col">
                 <p>
-                    <label for="sdnetworkgroup_destination">destination network-group</label><br>
+                    <label for="sdnetworkgroup_destination">select at max one destination network-group</label><br>
                     <select name="sdnetworkgroup_destination" size="10" style="width: 200px;">
                         {% for f in firewall_networkgroup %}
                         <option>{{ f }}</option>

vycontrol/firewall/views.py

@@ -272,8 +272,27 @@ def addrule(request, firewall_name):
                         description = "set sdaddress_destination_txt",
                     )
 
+            # if criteria port set, save it
+            if request.POST.get('criteria_addressgroup', None) == "1":
+                if request.POST.get('sdaddressgroup_source', None) != None:              
+                    sdaddressgroup_source = request.POST.get('sdaddressgroup_source')
+                    v = vyos2.api (
+                            hostname=   hostname_default,
+                            api =       "post",
+                            op =        "set",
+                            cmd =       ["firewall", "name", firewall_name, "rule", request.POST.get('rulenumber'), "source", "group", "address-group", sdaddressgroup_source],
+                            description = "set sdaddressgroup_source",
+                    )
 
-
+                if request.POST.get('sdaddressgroup_destination', None) != None:              
+                    sdaddressgroup_destination = request.POST.get('sdaddressgroup_destination')                    
+                    v = vyos2.api (
+                        hostname=   hostname_default,
+                        api =       "post",
+                        op =        "set",
+                        cmd =       ["firewall", "name", firewall_name, "rule", request.POST.get('rulenumber'), "destination", "group", "address-group", sdaddressgroup_destination],
+                        description = "set sdaddressgroup_destination",
+                    )