From: Fedor Zhadaev <fzhadaev@mirantis.com>
Date: Wed, 20 Jul 2016 05:46:42 +0000 (+0300)
Subject: Fix default value for plugin metadata
X-Git-Tag: colorado.1.rc1~64^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9676e3fa9f44e6ebc36ac4c4db874c4ff0bb51a8;p=fuel.git

Fix default value for plugin metadata

Fix typo which result in error while getting default metadata
in case if it's not overridden in scenario.

Fixes https://jira.opnfv.org/browse/FUEL-151

Change-Id: Ibf40f846919155e27da5dc1f778f72afee79ff12
Signed-off-by: Fedor Zhadaev <fzhadaev@mirantis.com>
---

diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py
index 65d51b228..226e3d59e 100644
--- a/deploy/deploy-config.py
+++ b/deploy/deploy-config.py
@@ -101,13 +101,10 @@ def merge_fuel_plugin_version_list(list1, list2):
     # When the plugin version in not there in list1 it will
     # not be copied
     for e_l1 in list1:
-        plugin_version = e_l1.get('metadata',
-                                  {'plugin_version', None}).get('plugin_version')
+        plugin_version = e_l1.get('metadata', {}).get('plugin_version')
         plugin_version_found = False
         for e_l2 in list2:
-            if plugin_version == e_l2.get('metadata',
-                                          {'plugin_version',
-                                           None}).get('plugin_version'):
+            if plugin_version == e_l2.get('metadata', {}).get('plugin_version'):
                 final_list.append(dict(mergedicts(e_l1, e_l2)))
                 plugin_version_found = True
         if not plugin_version_found: