qontract-reconcile 0.10.1rc1095__py3-none-any.whl → 0.10.1rc1096__py3-none-any.whl

{qontract_reconcile-0.10.1rc1095.dist-info → qontract_reconcile-0.10.1rc1096.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qontract-reconcile
-Version: 0.10.1rc1095
+Version: 0.10.1rc1096
 Summary: Collection of tools to reconcile services with their desired state as defined in the app-interface DB.
 Home-page: https://github.com/app-sre/qontract-reconcile
 Author: Red Hat App-SRE Team

{qontract_reconcile-0.10.1rc1095.dist-info → qontract_reconcile-0.10.1rc1096.dist-info}/RECORD

@@ -54,7 +54,7 @@ reconcile/ocm_additional_routers.py,sha256=KfcFDVbNoc6n5dHWjYdAf1_DiVqVG6Tw23WLK
 reconcile/ocm_addons.py,sha256=qqAyqRBRbdZQvAcjb-QlSVyRAyQBZk6iVlgnI4jyi7s,3353
 reconcile/ocm_addons_upgrade_tests_trigger.py,sha256=A9zXeYG-_52DsS1dz47yDSnHz62du5XpPBlaeRa6zxY,3975
 reconcile/ocm_aws_infrastructure_access.py,sha256=rrlcQxvRTmKyYOUR1C-Nlxj_o_iCDSxc7PNoELUDiew,6892
-reconcile/ocm_clusters.py,sha256=0AlqFrUoxxB8rsOgobvnwiBI2Zal8BK2TI2cpWa0Qqg,16895
+reconcile/ocm_clusters.py,sha256=he-BkbEb-ozHuZNqRr2nIWUjBHhLF-2Jvcctx4K3eK4,17021
 reconcile/ocm_external_configuration_labels.py,sha256=imEpDv1RBpCSj8tHDv0R76hmNCFtcUzVNgS1yOVl8vs,3870
 reconcile/ocm_github_idp.py,sha256=glwXMsIBcl38-OmDDQCpe0YoLLXfoRgVQmqwXMEXjds,3946
 reconcile/ocm_groups.py,sha256=-rTPMewkdyo1De6gs4u-294p3z34oUbGfuNi8ov56Sk,3424
@@ -530,7 +530,7 @@ reconcile/test/test_jump_host.py,sha256=EeHMhT5rTZgx__R_29mtCBWt-NZCcKsQ6CR-B3xm
 reconcile/test/test_ldap_users.py,sha256=8jjzVgoiRRylGad6-TvkugoFGXt3eko--zVVKjmZDn4,3812
 reconcile/test/test_make.py,sha256=zTdjgq-3idFlec_0qJenk9wWw0QMLvSpJfPsptXmync,677
 reconcile/test/test_ocm_additional_routers.py,sha256=vX_O5js8PDTXU2mLD89tcMBqdpDKRNFWwxBB_UKP3Cc,4206
-reconcile/test/test_ocm_clusters.py,sha256=1tFzyjkVmQWRLYO2RRWSTy7xFYRQqL-wj0pfw5-5Lss,23909
+reconcile/test/test_ocm_clusters.py,sha256=QDieDrP7pjH7jw5pFcZkUGx1lUhd2Cdg8BM0bRnhhI8,24322
 reconcile/test/test_ocm_clusters_manifest_updates.py,sha256=jFRVfc5jby1kI2x_gT6wcqPPgkav1et9wZH6JqQbNSY,3278
 reconcile/test/test_ocm_machine_pools.py,sha256=_1tG-nF8edU29ONDUGXtR3J2-E8FWv-PI0Y9gb8HQfY,29697
 reconcile/test/test_ocm_update_recommended_version.py,sha256=01oONkMewUUMrLFwlsUKTuvzL9XEeMk5_kBkYGE-u4Q,4318
@@ -798,7 +798,7 @@ reconcile/utils/ocm/label_sources.py,sha256=ES_5VP4X6gsRxMFZ95WgbwE_HqqIUo_JRjHj
 reconcile/utils/ocm/labels.py,sha256=aCsL5QkRk32hZeJwsSJuCCT9sbojWMn8LL5Zo-aoFb4,5916
 reconcile/utils/ocm/manifests.py,sha256=Q6kgOeiAwLbJY_vO_BEW2oePvbLDZcMZk20YpJJGpOA,1195
 reconcile/utils/ocm/ocm.py,sha256=EwhCymt7r8cL8UF2XbwmQ6IiRE016AUuPEiMAtYMepE,36707
-reconcile/utils/ocm/products.py,sha256=XDmTkVv4eWEifloz_f2I8GmdM97tY33PLf2p4d5GMI0,25972
+reconcile/utils/ocm/products.py,sha256=Ki9o0VV4z_FsXQaJtSFzlUnxLvpk1H-RamvJpUwwbuQ,26006
 reconcile/utils/ocm/search_filters.py,sha256=jdj2sMGArcQrZLluzxeypPSbMFX_5zSE3ACvhNpsnOc,14814
 reconcile/utils/ocm/service_log.py,sha256=RG1f0MMn6joKaRCAm2xveSJCavdOPP1BVo9FXecDxaI,2018
 reconcile/utils/ocm/sre_capability_labels.py,sha256=nqh0imrYczNeeeC7ZNX3pEwuAIVkKLTKZf0YHSPZYpE,1537
@@ -870,8 +870,8 @@ tools/test/test_qontract_cli.py,sha256=_D61RFGAN5x44CY1tYbouhlGXXABwYfxKSWSQx3Jr
 tools/test/test_saas_promotion_state.py,sha256=dy4kkSSAQ7bC0Xp2CociETGN-2aABEfL6FU5D9Jl00Y,6056
 tools/test/test_sd_app_sre_alert_report.py,sha256=v363r9zM7__0kR5K6mvJoGFcM9BvE33fWAayrqkpojA,2116
 tools/test/test_sre_checkpoints.py,sha256=SKqPPTl9ua0RFdSSofnoQX-JZE6dFLO3LRhfQzqtfh8,2607
-qontract_reconcile-0.10.1rc1095.dist-info/METADATA,sha256=COuHGQ1AT5Zd2xD5SkfVDxPnfJdB0uuOdy6E-z3uSc4,2213
-qontract_reconcile-0.10.1rc1095.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-qontract_reconcile-0.10.1rc1095.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
-qontract_reconcile-0.10.1rc1095.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
-qontract_reconcile-0.10.1rc1095.dist-info/RECORD,,
+qontract_reconcile-0.10.1rc1096.dist-info/METADATA,sha256=yRvGWzA7FiVeLTcn5HCehJgz4D7ERObULAvVS-dnBok,2213
+qontract_reconcile-0.10.1rc1096.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+qontract_reconcile-0.10.1rc1096.dist-info/entry_points.txt,sha256=GKQqCl2j2X1BJQ69een6rHcR26PmnxnONLNOQB-nRjY,491
+qontract_reconcile-0.10.1rc1096.dist-info/top_level.txt,sha256=l5ISPoXzt0SdR4jVdkfa7RPSKNc8zAHYWAnR-Dw8Ey8,24
+qontract_reconcile-0.10.1rc1096.dist-info/RECORD,,

reconcile/ocm_clusters.py

@@ -23,6 +23,7 @@ from reconcile.status import ExitCodes
 from reconcile.utils.disabled_integrations import integration_is_enabled
 from reconcile.utils.jobcontroller.controller import build_job_controller
 from reconcile.utils.ocm.products import (
+    IGNORE_NETWORK_TYPE_ATTR,
     OCMProduct,
     OCMProductPortfolio,
     OCMValidationException,
@@ -248,10 +249,14 @@ def get_cluster_ocm_update_spec(
         desired_spec.network.type = "OVNKubernetes"
 
     cspec = current_spec.spec.dict()
-    cspec[ocmmod.SPEC_ATTR_NETWORK] = current_spec.network.dict()
+    cspec[ocmmod.SPEC_ATTR_NETWORK] = current_spec.network.dict(
+        exclude={IGNORE_NETWORK_TYPE_ATTR}
+    )
 
     dspec = desired_spec.spec.dict()
-    dspec[ocmmod.SPEC_ATTR_NETWORK] = desired_spec.network.dict()
+    dspec[ocmmod.SPEC_ATTR_NETWORK] = desired_spec.network.dict(
+        exclude={IGNORE_NETWORK_TYPE_ATTR}
+    )
 
     # Convert ocm specs to dicts, removing null values and excluded attributes
     current_ocm_spec = {

reconcile/test/test_ocm_clusters.py

@@ -461,6 +461,18 @@ def test_get_ocm_cluster_update_spec_network_banned(
     assert err is True
 
 
+def test_get_ocm_cluster_update_spec_network_type_ignored(
+    osd_product: OCMProductOsd, ocm_osd_cluster_spec: OCMSpec
+):
+    current_spec = ocm_osd_cluster_spec
+    desired_spec = current_spec.copy(deep=True)
+    desired_spec.network.type = "OVNKubernetes"
+    upd, err = occ.get_cluster_ocm_update_spec(
+        osd_product, "cluster1", current_spec, desired_spec
+    )
+    assert (upd, err) == ({}, False)
+
+
 @typing.no_type_check
 def test_get_ocm_cluster_update_spec_allowed_change(
     osd_product: OCMProductOsd, ocm_osd_cluster_spec: OCMSpec

reconcile/utils/ocm/products.py

@@ -46,6 +46,7 @@ SPEC_ATTR_SUBNET_IDS = "subnet_ids"
 SPEC_ATTR_AVAILABILITY_ZONES = "availability_zones"
 
 SPEC_ATTR_NETWORK = "network"
+IGNORE_NETWORK_TYPE_ATTR = "type"
 
 SPEC_ATTR_CONSOLE_URL = "consoleUrl"
 SPEC_ATTR_SERVER_URL = "serverUrl"