diff --git a/cd3_automation_toolkit/Network/BaseNetwork/create_major_objects.py b/cd3_automation_toolkit/Network/BaseNetwork/create_major_objects.py index a660589c9..4b1e9840e 100644 --- a/cd3_automation_toolkit/Network/BaseNetwork/create_major_objects.py +++ b/cd3_automation_toolkit/Network/BaseNetwork/create_major_objects.py @@ -603,8 +603,8 @@ def processVCN(tempStr): str(df.loc[i, 'CIDR Blocks']).lower() == 'nan' or str(df.loc[i, 'DRG Required']).lower() == 'nan' or str( df.loc[i, 'IGW Required']).lower() == 'nan' or str(df.loc[i, 'NGW Required']).lower() == 'nan' or str( - df.loc[i, 'SGW Required']).lower() == 'nan' or str(df.loc[i, 'LPG Required']).lower() == 'nan' or - str(df.loc[i, 'Hub/Spoke/Peer/None']).lower() == 'nan'): + df.loc[i, 'SGW Required']).lower() == 'nan' or str(df.loc[i, 'LPG Required']).lower() == 'nan'): + #or str(df.loc[i, 'Hub/Spoke/Peer/None']).lower() == 'nan'): print("\nColumn Values(except dns_label) or Rows cannot be left empty in VCNs sheet in CD3..exiting...") exit(1) diff --git a/cd3_automation_toolkit/cd3Validator.py b/cd3_automation_toolkit/cd3Validator.py index 33100ca6d..7045be5d7 100644 --- a/cd3_automation_toolkit/cd3Validator.py +++ b/cd3_automation_toolkit/cd3Validator.py @@ -460,7 +460,7 @@ def validate_vcns(filename, comp_ids, vcnobj):# config): # ,vcn_cidrs,vcn_compa # Check for null values and display appropriate message for j in dfv.keys(): if (str(dfv[j][i]).strip() == "NaN" or str(dfv[j][i]).strip() == "nan" or str(dfv[j][i]).strip() == ""): - if j == 'DNS Label' or commonTools.check_column_headers(j) in commonTools.tagColumns or "ipv6" in j.lower(): + if j == 'DNS Label' or commonTools.check_column_headers(j) in commonTools.tagColumns or "ipv6" in j.lower() or "Hub/Spoke" in j: continue else: log(f'ROW {count+2} : Empty value at column "{j}".')