From 930abb12b355fa6fcf2dded780e2031be24c2964 Mon Sep 17 00:00:00 2001
From: Yadnesh Kulkarni <ykulkarn@redhat.com>
Date: Mon, 26 Apr 2021 21:29:02 +0530
Subject: [PATCH] Fix network environment validation

Network environment validation fails when accessing value
with the key 'os_net_config' from the nic-config files.
Fix the dictionary keys needed to fetch the network
config from nic_data.

Signed-off-by: Yadnesh Kulkarni <ykulkarn@redhat.com>
Change-Id: I2ec628dd9c9cf14c0cd9d8ba30f53ac18efe115f
---
 .../test_overcloud_netenv_validate.py                     | 8 ++++++--
 tripleoclient/v1/overcloud_netenv_validate.py             | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/tripleoclient/tests/v1/overcloud_netenv_validate/test_overcloud_netenv_validate.py b/tripleoclient/tests/v1/overcloud_netenv_validate/test_overcloud_netenv_validate.py
index bb234ecb1..6649d950e 100644
--- a/tripleoclient/tests/v1/overcloud_netenv_validate/test_overcloud_netenv_validate.py
+++ b/tripleoclient/tests/v1/overcloud_netenv_validate/test_overcloud_netenv_validate.py
@@ -46,8 +46,12 @@ class TestValidateOvercloudNetenv(fakes.TestValidateOvercloudNetenv):
                 'OsNetConfigImpl': {
                     'properties': {
                         'config': {
-                            'os_net_config': {
-                                'network_config': bridges,
+                            'str_replace': {
+                                'params': {
+                                    '$network_config': {
+                                        'network_config': bridges,
+                                    }
+                                }
                             }
                         }
                     }
diff --git a/tripleoclient/v1/overcloud_netenv_validate.py b/tripleoclient/v1/overcloud_netenv_validate.py
index 15f1b038e..d3e0cf127 100644
--- a/tripleoclient/v1/overcloud_netenv_validate.py
+++ b/tripleoclient/v1/overcloud_netenv_validate.py
@@ -175,7 +175,7 @@ class ValidateOvercloudNetenv(command.Command):
         # no bonds.
         for item in nic_data['resources']:
             bridges = nic_data['resources'][item]['properties']['config'][
-                'os_net_config']['network_config']
+                'str_replace']['params']['$network_config']['network_config']
             for bridge in bridges:
                 if bridge['type'] == 'ovs_bridge':
                     bond_count = 0