Skip to content

Commit 59d8eb9

Browse files
xs2suruchixs2suruchi
committed
Automation Toolkit Release v2024.4.1
1 parent 9bfc2cf commit 59d8eb9

File tree

6 files changed

+29
-28
lines changed

6 files changed

+29
-28
lines changed

‎cd3_automation_toolkit/Compute/templates/instances-template‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ instances = {
9191
{% if plugin_match %}
9292
plugins_details = {
9393
{% if plugin_bastion %}
94-
Bastion = "{{ plugin_bastion.upper() }}",
94+
Bastion = "{{ plugin_bastion.upper() }}"
9595
{% endif %}
9696
{% if plugin_management_agent %}
97-
"Management Agent" = "{{ plugin_management_agent.upper() }}",
97+
"Management Agent" = "{{ plugin_management_agent.upper() }}"
9898
{% endif %}
9999
{% if plugin_vulnerability_scanning %}
100100
"Vulnerability Scanning" = "{{ plugin_vulnerability_scanning.upper() }}"
@@ -126,6 +126,13 @@ instances = {
126126
{% if plugin_compute_hpc_rdma_auto_configuration %}
127127
"Compute HPC RDMA Auto-Configuration" = "{{ plugin_compute_hpc_rdma_auto_configuration.upper() }}"
128128
{% endif %}
129+
{% if plugin_os_management_hub_agent %}
130+
"OS Management Hub Agent" = "{{ plugin_os_management_hub_agent.upper() }}"
131+
{% endif %}
132+
{% if plugin_cloud_guard_workload_protection %}
133+
"Cloud Guard Workload Protection" = "{{ plugin_cloud_guard_workload_protection.upper() }}"
134+
{% endif %}
135+
129136
}
130137
{% endif %}
131138

‎cd3_automation_toolkit/Network/BaseNetwork/export_network_nonGreenField.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,7 @@ def export_major_objects(inputfile, outdir, service_dir, config, signer, ct, exp
782782
drg_attachment_info = None
783783
vcn_info = None
784784
drg_info = vnc.get_drg(drg_id).data
785+
drg_display_name = drg_info.display_name
785786

786787
if drg_info.default_drg_route_tables is not None:
787788
DRG_RTs = oci.pagination.list_call_get_all_results(vnc.list_drg_route_tables,

‎cd3_automation_toolkit/Network/BaseNetwork/modify_secrules_tf.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ def generate_security_rules(region_seclist_name,processed_seclist,tfStr,region,t
160160
columnvalue = commonTools.check_columnvalue(columnvalue)
161161

162162
# Check for multivalued columns
163-
tempdict = commonTools.check_multivalues_columnvalue(columnvalue, columnname, tempdict)
163+
if columnname.lower() not in ["source", "destination"]: # this is to support IPv6 CIDRs as it contains "::"
164+
tempdict = commonTools.check_multivalues_columnvalue(columnvalue, columnname, tempdict)
164165

165166
# Process Defined and Freeform Tags
166167
if columnname.lower() in commonTools.tagColumns:

‎cd3_automation_toolkit/Security/KeyVault/export_keyvaults_nonGreenField.py‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ def export_keyvaults(inputfile, outdir, service_dir, config, signer, ct, export_
7676
key_count = 0
7777
if vault.lifecycle_state not in ["DELETED", "PENDING_DELETION", "SCHEDULING_DELETION"]:
7878
try:
79+
replicas = kms_vault_client.list_vault_replicas(vault_id=vault.id).data
80+
for replica in replicas:
81+
region_name = None
82+
for region, region_identifier in ct.region_dict.items():
83+
if region_identifier == replica.region:
84+
region_name = region
85+
break
7986
kms_key_client = oci.key_management.KmsManagementClient(config,service_endpoint=vault.management_endpoint,retry_strategy=oci.retry.DEFAULT_RETRY_STRATEGY,signer=signer)
8087
keys = oci.pagination.list_call_get_all_results(kms_key_client.list_keys, compartment_id=ct.ntk_compartment_ids[
8188
ntk_compartment_name])
@@ -113,20 +120,13 @@ def export_keyvaults(inputfile, outdir, service_dir, config, signer, ct, export_
113120
values_for_column_kms[col_header].append(vault.vault_type)
114121

115122
elif col_header == 'Replica Region':
116-
replicas = kms_vault_client.list_vault_replicas(vault_id=vault.id).data
117123
if not replicas:
118124
values_for_column_kms[col_header].append('')
119125
else:
120-
for replica in replicas:
121-
region_name = None
122-
for region, region_identifier in ct.region_dict.items():
123-
if region_identifier == replica.region:
124-
region_name = region
125-
break
126-
if region_name:
127-
values_for_column_kms[col_header].append(region_name)
128-
else:
129-
values_for_column_kms[col_header].append('')
126+
if region_name:
127+
values_for_column_kms[col_header].append(region_name)
128+
else:
129+
values_for_column_kms[col_header].append('')
130130
elif str(col_header).lower() in ["vault defined tags", "vault freeform tags"]:
131131
values_for_column_kms = commonTools.export_tags(vault, col_header,
132132
values_for_column_kms)
@@ -201,20 +201,13 @@ def export_keyvaults(inputfile, outdir, service_dir, config, signer, ct, export_
201201
elif col_header == 'Vault type':
202202
values_for_column_kms[col_header].append(vault.vault_type)
203203
elif col_header == 'Replica Region':
204-
replicas = kms_vault_client.list_vault_replicas(vault_id=vault.id).data
205204
if not replicas:
206205
values_for_column_kms[col_header].append('')
207206
else:
208-
for replica in replicas:
209-
region_name = None
210-
for region, region_identifier in ct.region_dict.items():
211-
if region_identifier == replica.region:
212-
region_name = region
213-
break
214-
if region_name:
215-
values_for_column_kms[col_header].append(region_name)
216-
else:
217-
values_for_column_kms[col_header].append('')
207+
if region_name:
208+
values_for_column_kms[col_header].append(region_name)
209+
else:
210+
values_for_column_kms[col_header].append('')
218211
elif str(col_header).lower() in ["vault defined tags", "vault freeform tags"]:
219212
values_for_column_kms = commonTools.export_tags(vault, col_header,
220213
values_for_column_kms)

‎cd3_automation_toolkit/user-scripts/terraform/networkloadbalancer.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module "nlb-backends" {
8686
backend_set_name = merge(module.nlb-backend-sets.*...)[each.value.backend_set_name]["nlb_backend_set_tf_name"]
8787
network_load_balancer_id = length(regexall("ocid1.loadbalancer.oc*", each.value.network_load_balancer_id)) > 0 ? each.value.network_load_balancer_id : merge(module.network-load-balancers.*...)[each.value.network_load_balancer_id]["network_load_balancer_tf_id"]
8888
port = each.value.port
89-
#vnic_vlan = each.value.vnic_vlan
89+
#vnic_vlan = each.value.vnic_vlan != null ? each.value.vnic_vlan : null
9090
ip_address = each.value.ip_address
9191
instance_compartment = each.value.instance_compartment != "" ? (length(regexall("ocid1.compartment.oc*", each.value.instance_compartment)) > 0 ? each.value.instance_compartment : var.compartment_ocids[each.value.instance_compartment]) : var.tenancy_ocid
9292
#ip_address = each.value.ip_address != "" ? (length(regexall("IP:", each.value.ip_address)) > 0 ? split("IP:", each.value.ip_address)[1] : data.oci_core_instance.nlb_instance_ip[each.key].private_ip) : (length(regexall("NAME:", each.value.ip_address)) > 0 ? split("NAME:", each.value.ip_address)[1] : data.oci_core_instance.nlb_instance[each.key].private_ip) : null

‎jenkins_install/setUpOCI.groovy‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@ pipeline {
207207
labelledShell( label: 'Executing setUpOCI python script', script: '''
208208
set +x
209209
cd /cd3user/oci_tools/cd3_automation_toolkit
210-
python --version
211210
python setUpOCI.py --devops True --main_options "${MainOptions}" --sub_options "${SubOptions}" --sub_child_options "${SubChildOptions}" --add_filter "${AdditionalFilters}" $prop_file
212211
cd -
213212
rm -rf *.*
@@ -278,7 +277,7 @@ pipeline {
278277
echo $cd3_file
279278
''', returnStdout: true).trim()
280279
}
281-
archiveArtifacts "${file_path.split("/")[(file_path.split("/")).length-1]}, *.zip"
280+
archiveArtifacts "${file_path.split("/")[(file_path.split("/")).length-1]}, *.zip,*.xl*"
282281

283282
}
284283
}

0 commit comments

Comments
 (0)