X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=apex.git;a=blobdiff_plain;f=apex%2Fnetwork%2Fnetwork_environment.py;fp=apex%2Fnetwork%2Fnetwork_environment.py;h=52b4452a879d02af57effeb8af46955e5dbcc8cc;hp=0a4d10360afb9841043e6f0a0d8120eefcb446df;hb=e1c6f92cdac07949b00c758bab5c79ff20639dd9;hpb=cf3f62e9bac681bad8e81c568893077f122da619

diff --git a/apex/network/network_environment.py b/apex/network/network_environment.py
index 0a4d1036..52b4452a 100644
--- a/apex/network/network_environment.py
+++ b/apex/network/network_environment.py
@@ -186,6 +186,8 @@ class NetworkEnvironment(dict):
             for flag in IPV6_FLAGS:
                 self[param_def][flag] = True
 
+        self._update_service_netmap(net_settings.enabled_network_list)
+
     def _get_vlan(self, network):
         if isinstance(network['nic_mapping'][CONTROLLER]['vlan'], int):
             return network['nic_mapping'][CONTROLLER]['vlan']
@@ -218,6 +220,13 @@ class NetworkEnvironment(dict):
                 prefix = ''
             self[reg][key] = self.tht_dir + prefix + postfix
 
+    def _update_service_netmap(self, network_list):
+        if 'ServiceNetMap' not in self[param_def]:
+            return
+        for service, network in self[param_def]['ServiceNetMap'].items():
+            if network not in network_list:
+                self[param_def]['ServiceNetMap'][service] = 'ctlplane'
+
 
 class NetworkEnvException(Exception):
     def __init__(self, value):