Remove six from sample scripts

six is no longer needed since python 2 support was removed.

Change-Id: I87eef25a2e9f81aa6c6a31f4dcb9c900b8984162

samples/mgmt_driver/ansible/ansible_config_parser.py

@@ -13,7 +13,6 @@
 import ast
 import datetime
 import re
-import six
 import yaml
 
 from heatclient import client as hclient
@@ -146,7 +145,7 @@ class ConfigParser():
                 list_flag = True
             elif isinstance(command, dict):
                 dict_flag = True
-            elif not isinstance(command, six.string_types):
+            elif not isinstance(command, str):
                 raise Exception(
                     "Value '{}' of type '{}' is not yet supported "
                     " for parameter substitution."
@@ -365,7 +364,7 @@ class ConfigParser():
         # apply filters
         if isinstance(items, dict):
             raw_result = dict(filter(filter_func, items.items()))
-        elif isinstance(items, six.string_types):
+        elif isinstance(items, str):
             # check if instance is string dict, else return as string,
             # since item is a single value
             try:
@@ -459,7 +458,7 @@ class ConfigHandle():
                     res = res + "{}".format(item)
                 else:
                     res = res + ",{}".format(item)
-        elif isinstance(items, six.string_types):
+        elif isinstance(items, str):
             res = items
         else:
             raise Exception(

samples/mgmt_driver/ansible/config_actions/vm_app_config/ansible_playbook_exec.py

@@ -14,7 +14,6 @@ import json
 import os
 
 from oslo_log import log as logging
-from six import iteritems
 from tacker.vnfm.mgmt_drivers.ansible import event_handler
 from tacker.vnfm.mgmt_drivers.ansible import exceptions
 
@@ -73,7 +72,7 @@ class AnsiblePlaybookExecutor(executor.Executor):
         params = ""
         obj_params = playbook_cmd.get("params", "")
         if obj_params:
-            for key, value in iteritems(obj_params):
+            for key, value in obj_params.items():
                 if isinstance(value, dict):
                     str_value = json.dumps(
                         value, separators=(',', ':')).replace('"', '\\"')