Revert "Ensure system_cfg read before ds net config on Oracle (#1174)" (

#1326)

This reverts commit b306633.

While this ultimately seems like a better solution, currently the
file /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg exists on
all Oracle launched instances which will prevent networking from
being properly initialized.

cloudinit/sources/DataSourceOracle.py

@@ -104,9 +104,9 @@ class DataSourceOracle(sources.DataSource):
     vendordata_pure = None
     network_config_sources = (
         sources.NetworkConfigSource.cmdline,
-        sources.NetworkConfigSource.system_cfg,
         sources.NetworkConfigSource.ds,
         sources.NetworkConfigSource.initramfs,
+        sources.NetworkConfigSource.system_cfg,
     )
 
     _network_config = sources.UNSET

tests/unittests/sources/test_oracle.py

@@ -920,14 +920,12 @@ def test_secondary_nic_failure_isnt_blocking(
         assert network_config == m_read_initramfs_config.return_value
         assert "Failed to parse secondary network configuration" in caplog.text
 
-    def test_ds_network_cfg_order(self, _m):
-        """Ensure that DS net config is preferred over initramfs config
-        but less than system config."""
+    def test_ds_network_cfg_preferred_over_initramfs(self, _m):
+        """Ensure that DS net config is preferred over initramfs config"""
         config_sources = oracle.DataSourceOracle.network_config_sources
-        system_idx = config_sources.index(NetworkConfigSource.system_cfg)
         ds_idx = config_sources.index(NetworkConfigSource.ds)
         initramfs_idx = config_sources.index(NetworkConfigSource.initramfs)
-        assert system_idx < ds_idx < initramfs_idx
+        assert ds_idx < initramfs_idx
 
 
 # vi: ts=4 expandtab