Skip to content

Commit

Permalink
Additional VS cloning enhancements
Browse files Browse the repository at this point in the history
  • Loading branch information
@thebertster
thebertster committed May 6, 2024
1 parent 9774e5b commit eedc9ec
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 22 deletions.
2 changes: 2 additions & 0 deletions python/avi/sdk/samples/clone_vs.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,3 +330,5 @@ Changelog:
* Add support for cloning HealthMonitors with SSL attributes or authentication attributes (authentication attributes must be manually re-entered)
* Add support for cloning AuthProfiles for OAuth2
* Add support for cloning VS with OAuth2 SSO configuration
* Add support for cloning VS with service-level network/application profile overrides
* Add support for cloning DNS VS with Topology Policies
67 changes: 45 additions & 22 deletions python/avi/sdk/samples/clone_vs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,23 @@ class AviClone:
'pool-pkiprofile': 'pki_profile_ref',
'pool-sslcert': 'ssl_key_and_certificate_ref',
'pool-analyticsprofile': 'analytics_profile_ref',
'pool-autoscalepolicy': 'autoscale_policy_ref'}
'pool-autoscalepolicy': 'autoscale_policy_ref'
}
VALID_DATASCRIPT_REF_OBJECTS = {
'ds-ipgroup': 'ipgroup_refs',
'ds-stringgroup': 'string_group_refs',
'ds-protocolparser': 'protocol_parser_refs',
'ds-sslprofile': 'ssl_profile_refs',
'ds-pkiprofile': 'pki_profile_refs',
'ds-geodb': 'geo_db_ref',
'ds-ipreputation': 'ip_reputation_db_ref'}
'ds-ipreputation': 'ip_reputation_db_ref'
}
VALID_POLICYSET_REF_OBJECTS = {
'policy-ipgroup': 'group_refs',
'policy-stringgroup': 'string_group_refs',
'policy-geodb': 'geo_db_ref',
'policy-ipreputation': 'ip_reputation_db_ref'}
'policy-ipreputation': 'ip_reputation_db_ref'
}
VALID_VS_REF_OBJECTS = {
'vs-appprofile': 'application_profile_ref',
'vs-networkprofile': 'network_profile_ref',
Expand All @@ -93,7 +96,12 @@ class AviClone:
'vs-authprofile': 'client_auth/auth_profile_ref',
'vs-ssoauthprofile': 'sso_policy/default_auth_profile_ref',
'vs-ssopolicy': 'sso_policy_ref',
'vs-botpolicy': 'bot_policy_ref'}
'vs-botpolicy': 'bot_policy_ref'
}
VALID_VS_OVERRIDE_REF_OBJECTS = {
'vsoverride-appprofile': 'override_application_profile_ref',
'vsoverride-networkprofile': 'override_network_profile_ref',
}
VALID_GS_REF_OBJECTS = {
'gs-persistency': 'application_persistence_profile_ref',
'gs-healthmonitor': 'health_monitor_refs'
Expand Down Expand Up @@ -2270,6 +2278,18 @@ def clone_vs(self, old_vs_name, new_vs_name, enable_vs=False,

v_obj['pool_group_ref'] = pg_obj['url']

# Handle service overrides

if 'services' in v_obj:
valid_s_ref_objects = self.VALID_VS_OVERRIDE_REF_OBJECTS
for service in v_obj['services']:
(s_created_objs,
s_warnings) = self._process_refs(parent_obj=service,
refs=valid_s_ref_objects,
force_clone=force_clone)
created_objs.extend(s_created_objs)
warnings.extend(s_warnings)

# Remove unique atributes and rename

v_obj.pop('uuid', None)
Expand Down Expand Up @@ -2302,12 +2322,12 @@ def clone_vs(self, old_vs_name, new_vs_name, enable_vs=False,

if 'oauth_settings' in v_obj.get('oauth_vs_config', {}):
oauth_settings = v_obj['oauth_vs_config']['oauth_settings']
valid_ref_objects = self.VALID_OAUTHSETTINGS_REF_OBJECTS
valid_o_ref_objects = self.VALID_OAUTHSETTINGS_REF_OBJECTS
for oauth_setting in oauth_settings:

(oa_created_objs,
oa_warnings) = self._process_refs(parent_obj=oauth_setting,
refs=valid_ref_objects,
refs=valid_o_ref_objects,
force_clone=force_clone)
created_objs.extend(oa_created_objs)
warnings.extend(oa_warnings)
Expand Down Expand Up @@ -2397,24 +2417,26 @@ def clone_vs(self, old_vs_name, new_vs_name, enable_vs=False,
created_objs.extend(ps_created_objs)
warnings.extend(ps_warnings)

# Clone any DNS policy sets referenced in the VS
# Clone any DNS / Topology Policy sets referenced in the VS

if 'dns_policies' in v_obj:
for polset in v_obj['dns_policies']:
ps_path = polset['dns_policy_ref'].split('/api/')[1]
ps_name = '-'.join([new_vs_name,
(c_obj['name']
if self.oc_obj is None
else self.oc_obj['name']),
'DNS-Policy'])
ps_obj, ps_created_objs, ps_warnings = self.clone_object(
old_name=ps_path, new_name=ps_name,
force_clone=force_clone, force_unique_name=True)
dns_topo_policies = (v_obj.get('dns_policies', []) +
v_obj.get('topology_policies', []))

polset['dns_policy_ref'] = ps_obj['url']
created_objs.append(ps_obj)
created_objs.extend(ps_created_objs)
warnings.extend(ps_warnings)
for polset in dns_topo_policies:
ps_path = polset['dns_policy_ref'].split('/api/')[1]
ps_name = '-'.join([new_vs_name,
(c_obj['name']
if self.oc_obj is None
else self.oc_obj['name']),
'DNS-Policy'])
ps_obj, ps_created_objs, ps_warnings = self.clone_object(
old_name=ps_path, new_name=ps_name,
force_clone=force_clone, force_unique_name=True)

polset['dns_policy_ref'] = ps_obj['url']
created_objs.append(ps_obj)
created_objs.extend(ps_created_objs)
warnings.extend(ps_warnings)

# Clone network security policy referenced in the VS

Expand Down Expand Up @@ -2568,6 +2590,7 @@ def clone_vs(self, old_vs_name, new_vs_name, enable_vs=False,

valid_refs = sorted(
set(AviClone.VALID_VS_REF_OBJECTS.keys()) |
set(AviClone.VALID_VS_OVERRIDE_REF_OBJECTS.keys()) |
set(AviClone.VALID_GS_REF_OBJECTS.keys()) |
set(AviClone.VALID_WAFPOLICY_REF_OBJECTS.keys()) |
set(AviClone.VALID_WAFPOLICYPSMGROUP_REF_OBJECTS.keys()) |
Expand Down

0 comments on commit eedc9ec

Please sign in to comment.