From bc353d8059c2cc8777616fe444b3f2239c18bdb6 Mon Sep 17 00:00:00 2001 From: Toshiaki Takahashi Date: Thu, 12 Mar 2020 23:00:02 +0900 Subject: [PATCH] Fix k8s features for pyhton3 support Operator + cannot be used for dict_items in Python3. Change to use update method. Change-Id: I43a8a46af3c069db2022e83854e20f0c3532f86d Signed-off-by: Toshiaki Takahashi --- .../vnfm/infra_drivers/kubernetes/k8s/translate_outputs.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tacker/vnfm/infra_drivers/kubernetes/k8s/translate_outputs.py b/tacker/vnfm/infra_drivers/kubernetes/k8s/translate_outputs.py index df6199223..77b539941 100644 --- a/tacker/vnfm/infra_drivers/kubernetes/k8s/translate_outputs.py +++ b/tacker/vnfm/infra_drivers/kubernetes/k8s/translate_outputs.py @@ -214,9 +214,8 @@ class Transformer(object): if tosca_kube_obj.labels: if 'selector' in update_label: del update_label['selector'] - labels = dict(tosca_kube_obj.labels.items() + update_label.items()) - else: - labels = update_label + update_label.update(tosca_kube_obj.labels) + labels = update_label # Create and configure a spec section pod_template = client.V1PodTemplateSpec(