diff --git a/dpugen/dashgen/acl_rule.py b/dpugen/dashgen/acl_rule.py index dac3361..03ea5ff 100644 --- a/dpugen/dashgen/acl_rule.py +++ b/dpugen/dashgen/acl_rule.py @@ -35,11 +35,11 @@ def items(self): all_ips_stage4 = all_ips_stage1 + 3 * cp.IP_STEP_NSG all_ips_stage5 = all_ips_stage1 + 4 * cp.IP_STEP_NSG ip_list_all = [ - str(all_ips_stage1)+'/15', - str(all_ips_stage2)+'/15', - str(all_ips_stage3)+'/15', - str(all_ips_stage4)+'/15', - str(all_ips_stage5)+'/15', + str(all_ips_stage1) + '/15', + str(all_ips_stage2) + '/15', + str(all_ips_stage3) + '/15', + str(all_ips_stage4) + '/15', + str(all_ips_stage5) + '/15', ] # Allow @@ -85,14 +85,12 @@ def items(self): all_ips_stage4 = all_ips_stage1 + 3 * cp.IP_STEP_NSG all_ips_stage5 = all_ips_stage1 + 4 * cp.IP_STEP_NSG ip_list_all = [ - str(all_ips_stage1)+'/15', - str(all_ips_stage2)+'/15', - str(all_ips_stage3)+'/15', - str(all_ips_stage4)+'/15', - str(all_ips_stage5)+'/15', + str(all_ips_stage1) + '/15', + str(all_ips_stage2) + '/15', + str(all_ips_stage3) + '/15', + str(all_ips_stage4) + '/15', + str(all_ips_stage5) + '/15', ] - - # allow self.num_yields += 1 yield { diff --git a/dpugen/dashgen/dash_vnet_mapping_table.py b/dpugen/dashgen/dash_vnet_mapping_table.py index cb3edc1..78cfd33 100644 --- a/dpugen/dashgen/dash_vnet_mapping_table.py +++ b/dpugen/dashgen/dash_vnet_mapping_table.py @@ -38,10 +38,10 @@ def items(self): (acl_index * int(ipa(p.IP_STEP_ACL))) remote_mac_a = str( maca( - int(maca(p.MAC_R_START)) + - eni_index * int(maca(p.ENI_MAC_STEP)) + - nsg_index * int(maca(p.ACL_NSG_MAC_STEP)) + - acl_index * int(maca(p.ACL_POLICY_MAC_STEP)) + int(maca(p.MAC_R_START)) + + eni_index * int(maca(p.ENI_MAC_STEP)) + + nsg_index * int(maca(p.ACL_NSG_MAC_STEP)) + + acl_index * int(maca(p.ACL_POLICY_MAC_STEP)) ) ).replace('-', ':') diff --git a/dpugen/dashgen/vpc.py b/dpugen/dashgen/vpc.py index 46b239e..9c0ba56 100644 --- a/dpugen/dashgen/vpc.py +++ b/dpugen/dashgen/vpc.py @@ -23,7 +23,7 @@ def items(self): ENI_L2R_STEP = p.ENI_L2R_STEP ENI_COUNT = p.ENI_COUNT - for eni_index in range(1, ENI_COUNT+1): + for eni_index in range(1, ENI_COUNT + 1): IP_L = IP_L_START + (eni_index - 1) * IP_STEP_ENI r_vpc = eni_index + ENI_L2R_STEP IP_R = IP_R_START + (eni_index - 1) * IP_STEP_ENI diff --git a/dpugen/dflt_params.py b/dpugen/dflt_params.py index cdce923..2f2dc35 100644 --- a/dpugen/dflt_params.py +++ b/dpugen/dflt_params.py @@ -9,7 +9,7 @@ 'PAR': '221.2.0.1', # '221.2.0.1' 'ENI_START': 1, # 1 - 'ENI_COUNT': 32, # 64 + 'ENI_COUNT': 32, # 32 'ENI_MAC_STEP': '00:00:00:18:00:00', # '00:00:00:18:00:00' 'ENI_STEP': 1, # 1 'ENI_L2R_STEP': 1000, # 1000 diff --git a/dpugen/saigen/acl_rule.py b/dpugen/saigen/acl_rule.py index d67c3a2..2de442d 100644 --- a/dpugen/saigen/acl_rule.py +++ b/dpugen/saigen/acl_rule.py @@ -31,8 +31,8 @@ def items(self): # print(" %d" % ip_index) remote_ip_a = cp.IP_R_START + eni_index * cp.IP_STEP_ENI + stage_in_index * cp.IP_STEP_NSG + ip_index * cp.IP_STEP_ACL - ip_list_a = [str(remote_ip_a + expanded_index * cp.IP_STEPE) + - '/32' for expanded_index in range(0, p.IP_PER_ACL_RULE)] + ip_list_a = [str(remote_ip_a + expanded_index * cp.IP_STEPE) + + '/32' for expanded_index in range(0, p.IP_PER_ACL_RULE)] # allow self.num_yields += 1 @@ -42,13 +42,13 @@ def items(self): 'type': 'SAI_OBJECT_TYPE_DASH_ACL_RULE', 'attributes': [ 'SAI_DASH_ACL_RULE_ATTR_DASH_ACL_GROUP_ID', f'$in_acl_group_#eni{eni}nsg{nsg_index}', - 'SAI_DASH_ACL_RULE_ATTR_PRIORITY', '%d' % ip_index, - 'SAI_DASH_ACL_RULE_ATTR_ACTION', 'SAI_DASH_ACL_RULE_ACTION_PERMIT', - 'SAI_DASH_ACL_RULE_ATTR_SIP', ','.join(ip_list_a[:]), - 'SAI_DASH_ACL_RULE_ATTR_DIP', l_ip_ac, - # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL', 'sai_u8_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT', 'sai_u16_range_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT', 'sai_u16_range_list_t', + 'SAI_DASH_ACL_RULE_ATTR_PRIORITY','%d' % ip_index, + 'SAI_DASH_ACL_RULE_ATTR_ACTION','SAI_DASH_ACL_RULE_ACTION_PERMIT', + 'SAI_DASH_ACL_RULE_ATTR_SIP',','.join(ip_list_a[:]), + 'SAI_DASH_ACL_RULE_ATTR_DIP',l_ip_ac, + # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL','sai_u8_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT','sai_u16_range_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT','sai_u16_range_list_t', ] } @@ -64,13 +64,13 @@ def items(self): 'type': 'SAI_OBJECT_TYPE_DASH_ACL_RULE', 'attributes': [ 'SAI_DASH_ACL_RULE_ATTR_DASH_ACL_GROUP_ID', f'$in_acl_group_#eni{eni}nsg{nsg_index}', - 'SAI_DASH_ACL_RULE_ATTR_PRIORITY', f'{ip_index+1}', - 'SAI_DASH_ACL_RULE_ATTR_ACTION', 'SAI_DASH_ACL_RULE_ACTION_DENY', - 'SAI_DASH_ACL_RULE_ATTR_SIP', ','.join(ip_list_d[:]), - 'SAI_DASH_ACL_RULE_ATTR_DIP', l_ip_ac, - # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL', 'sai_u8_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT', 'sai_u16_range_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT', 'sai_u16_range_list_t', + 'SAI_DASH_ACL_RULE_ATTR_PRIORITY', f'{ip_index+1}', + 'SAI_DASH_ACL_RULE_ATTR_ACTION', 'SAI_DASH_ACL_RULE_ACTION_DENY', + 'SAI_DASH_ACL_RULE_ATTR_SIP', ','.join(ip_list_d[:]), + 'SAI_DASH_ACL_RULE_ATTR_DIP', l_ip_ac, + # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL', 'sai_u8_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT', 'sai_u16_range_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT', 'sai_u16_range_list_t', ] } @@ -97,13 +97,13 @@ def items(self): 'type': 'SAI_OBJECT_TYPE_DASH_ACL_RULE', 'attributes': [ 'SAI_DASH_ACL_RULE_ATTR_DASH_ACL_GROUP_ID', f'$in_acl_group_#eni{eni}nsg{nsg_index}', - 'SAI_DASH_ACL_RULE_ATTR_PRIORITY', f'{ip_index + 2}', - 'SAI_DASH_ACL_RULE_ATTR_ACTION', 'SAI_DASH_ACL_RULE_ACTION_PERMIT', - 'SAI_DASH_ACL_RULE_ATTR_SIP', ','.join(ip_list_all[:]), - 'SAI_DASH_ACL_RULE_ATTR_DIP', l_ip_ac, - # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL', 'sai_u8_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT', 'sai_u16_range_list_t', - # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT', 'sai_u16_range_list_t', + 'SAI_DASH_ACL_RULE_ATTR_PRIORITY', f'{ip_index + 2}', + 'SAI_DASH_ACL_RULE_ATTR_ACTION', 'SAI_DASH_ACL_RULE_ACTION_PERMIT', + 'SAI_DASH_ACL_RULE_ATTR_SIP', ','.join(ip_list_all[:]), + 'SAI_DASH_ACL_RULE_ATTR_DIP', l_ip_ac, + # 'SAI_DASH_ACL_RULE_ATTR_PROTOCOL', 'sai_u8_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_SRC_PORT', 'sai_u16_range_list_t', + # 'SAI_DASH_ACL_RULE_ATTR_DST_PORT', 'sai_u16_range_list_t', ] } @@ -115,8 +115,8 @@ def items(self): remote_ip_a = cp.IP_R_START + eni_index * cp.IP_STEP_ENI + \ (p.ACL_NSG_COUNT + stage_in_index) * cp.IP_STEP_NSG + ip_index * cp.IP_STEP_ACL - ip_list_a = [str(remote_ip_a + expanded_index * cp.IP_STEPE) + - '/32' for expanded_index in range(0, p.IP_PER_ACL_RULE)] + ip_list_a = [str(remote_ip_a + expanded_index * cp.IP_STEPE) + + '/32' for expanded_index in range(0, p.IP_PER_ACL_RULE)] # allow self.num_yields += 1