You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by sn...@apache.org on 2015/05/12 07:07:50 UTC
incubator-ranger git commit: RANGER-465: Handle file import failures
in config migration script
Repository: incubator-ranger
Updated Branches:
refs/heads/master 603812176 -> fd7d0805f
RANGER-465: Handle file import failures in config migration script
Signed-off-by: sneethiraj <sn...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/fd7d0805
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/fd7d0805
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/fd7d0805
Branch: refs/heads/master
Commit: fd7d0805f726c8a4f2b32295160c116c5106e2ae
Parents: 6038121
Author: Velmurugan Periasamy <ve...@apache.org>
Authored: Fri May 8 13:27:19 2015 -0400
Committer: sneethiraj <sn...@apache.org>
Committed: Mon May 11 22:07:40 2015 -0700
----------------------------------------------------------------------
migration-util/bin/import_ranger_to_ambari.py | 50 ++++++++++++----------
1 file changed, 28 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fd7d0805/migration-util/bin/import_ranger_to_ambari.py
----------------------------------------------------------------------
diff --git a/migration-util/bin/import_ranger_to_ambari.py b/migration-util/bin/import_ranger_to_ambari.py
index 319e65f..7b99b2f 100644
--- a/migration-util/bin/import_ranger_to_ambari.py
+++ b/migration-util/bin/import_ranger_to_ambari.py
@@ -1033,30 +1033,36 @@ def import_properties_from_file(install_properties_path, properties_from_file=No
if properties_from_file is None:
print('properties_from_file is none initializing to dict')
properties_from_file = dict()
- install_properties_file = open(install_properties_path)
- for each_line in install_properties_file.read().split('\n'):
- each_line = each_line.strip()
- if len(each_line) == 0: continue
- if '#https.service.port' in each_line:
- each_line = each_line.strip('#')
- if '#' in each_line: continue
- key, value = each_line.strip().split("=", 1)
- key = key.strip()
- value = value.strip()
- properties_from_file[key] = value
+ if os.path.isfile(install_properties_path):
+ install_properties_file = open(install_properties_path)
+ for each_line in install_properties_file.read().split('\n'):
+ each_line = each_line.strip()
+ if len(each_line) == 0: continue
+ if '#https.service.port' in each_line:
+ each_line = each_line.strip('#')
+ if '#' in each_line: continue
+ key, value = each_line.strip().split("=", 1)
+ key = key.strip()
+ value = value.strip()
+ properties_from_file[key] = value
+ else:
+ print('Property file not found at path : ' + str(install_properties_path))
return properties_from_file
def import_properties_from_xml(xml_path, properties_from_xml=None):
print('getting values from file : ' + str(xml_path))
- xml = ET.parse(xml_path)
- root = xml.getroot()
- if properties_from_xml is None:
- properties_from_xml = dict()
- for child in root.findall('property'):
- name = child.find("name").text.strip()
- value = child.find("value").text.strip() if child.find("value").text is not None else ""
- properties_from_xml[name] = value
+ if os.path.isfile(xml_path):
+ xml = ET.parse(xml_path)
+ root = xml.getroot()
+ if properties_from_xml is None:
+ properties_from_xml = dict()
+ for child in root.findall('property'):
+ name = child.find("name").text.strip()
+ value = child.find("value").text.strip() if child.find("value").text is not None else ""
+ properties_from_xml[name] = value
+ else:
+ print('XML file not found at path : ' + str(xml_path))
return properties_from_xml
@@ -1073,11 +1079,11 @@ def get_authentication_method():
if( ('authentication-provider' in str(child_nodes.tag)) and not('-ref' in str(child_nodes.attrib)) ):
reference_auth_method = child_nodes.attrib['ref']
- if('jaasAuthProvider' in reference_auth_method):
+ if( reference_auth_method is not None and 'jaasAuthProvider' in reference_auth_method):
authentication_method = 'UNIX'
- elif('activeDirectoryAuthenticationProvider' in reference_auth_method):
+ elif( reference_auth_method is not None and 'activeDirectoryAuthenticationProvider' in reference_auth_method):
authentication_method = 'ACTIVE_DIRECTORY'
- elif('ldapAuthProvider' in reference_auth_method):
+ elif( reference_auth_method is not None and 'ldapAuthProvider' in reference_auth_method):
authentication_method = 'LDAP'
else:
authentication_method = 'NONE'