Merge "Memory parameter intro"

diff --git a/recuserconfighandlers/recnetworkprofileshandler/recnetworkprofileshandler.py b/recuserconfighandlers/recnetworkprofileshandler/recnetworkprofileshandler.py
index 9bcbf4f..393f821 100644 (file)
--- a/recuserconfighandlers/recnetworkprofileshandler/recnetworkprofileshandler.py
+++ b/recuserconfighandlers/recnetworkprofileshandler/recnetworkprofileshandler.py
@@ -16,7 +16,6 @@
 from cmframework.apis import cmuserconfig
 from cmframework.apis import cmerror
 from cmdatahandlers.api import configerror
-from cmdatahandlers.network_profiles.config import config as net_prof_config
 
 """
 This plugin is used to handle REC specific network profiles configs. Currently
@@ -44,21 +43,15 @@ class recnetworkprofileshandler(cmuserconfig.CMUserConfigPlugin):
             try:
                 self._set_default_provider_network_type(netprofconf, profile)
                 self._set_default_sriov_provider_network_type(netprofconf, profile)
-            except (net_prof_config.MissingProviderNetworkInterfaces, net_prof_config.MissingSriovProviderNetworks):
+            except configerror.ConfigError:
                 pass
 
     def _set_default_provider_network_type(self, netprofconf, profile):
         for interface in netprofconf.get_profile_provider_network_interfaces(profile):
-            try:
-                netprofconf.get_profile_provider_network_interface_type(
-                    profile, interface)
-            except net_prof_config.MissingProviderNetworkInterfaceType:
-                netprofconf.set_profile_provider_network_interface_type(
-                        profile, interface, self.defaul_provider_interface_type)
+            netprofconf.set_profile_provider_network_interface_type(
+                    profile, interface, self.defaul_provider_interface_type)
 
     def _set_default_sriov_provider_network_type(self, netprofconf, profile):
         for sriov_net in netprofconf.get_profile_sriov_provider_networks(profile):
-            if not netprofconf.get_profile_sriov_provider_network_type(
-                    profile, sriov_net):
-                netprofconf.set_profile_sriov_provider_network_type(
-                        profile, sriov_net, self.defaul_sriov_net_type)
+            netprofconf.set_profile_sriov_provider_network_type(
+                    profile, sriov_net, self.defaul_sriov_net_type)