summaryrefslogtreecommitdiffstats
path: root/odl-pipeline/lib/utils
diff options
context:
space:
mode:
Diffstat (limited to 'odl-pipeline/lib/utils')
-rwxr-xr-xodl-pipeline/lib/utils/node.py2
-rwxr-xr-xodl-pipeline/lib/utils/node_manager.py3
-rwxr-xr-xodl-pipeline/lib/utils/processutils.py3
-rwxr-xr-xodl-pipeline/lib/utils/service.py2
-rwxr-xr-xodl-pipeline/lib/utils/shutil.py2
-rwxr-xr-xodl-pipeline/lib/utils/ssh_client.py2
-rwxr-xr-xodl-pipeline/lib/utils/ssh_util.py2
-rw-r--r--odl-pipeline/lib/utils/tripleo_helper.py19
-rwxr-xr-xodl-pipeline/lib/utils/utils_log.py2
-rwxr-xr-xodl-pipeline/lib/utils/utils_yaml.py2
10 files changed, 26 insertions, 13 deletions
diff --git a/odl-pipeline/lib/utils/node.py b/odl-pipeline/lib/utils/node.py
index c3c2005..4fe7e22 100755
--- a/odl-pipeline/lib/utils/node.py
+++ b/odl-pipeline/lib/utils/node.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/node_manager.py b/odl-pipeline/lib/utils/node_manager.py
index 8a320ed..fa4c6de 100755
--- a/odl-pipeline/lib/utils/node_manager.py
+++ b/odl-pipeline/lib/utils/node_manager.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -45,5 +45,6 @@ class NodeManager(object):
class NodeManagerException(Exception):
+
def __init__(self, value):
self.value = value
diff --git a/odl-pipeline/lib/utils/processutils.py b/odl-pipeline/lib/utils/processutils.py
index 2abb88a..98162c8 100755
--- a/odl-pipeline/lib/utils/processutils.py
+++ b/odl-pipeline/lib/utils/processutils.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
@@ -85,6 +85,7 @@ def mask_password(message, secret="***"):
class ProcessExecutionError(Exception):
+
def __init__(self, stdout=None, stderr=None, exit_code=None, cmd=None,
description=None):
self.exit_code = exit_code
diff --git a/odl-pipeline/lib/utils/service.py b/odl-pipeline/lib/utils/service.py
index cf46872..a264cea 100755
--- a/odl-pipeline/lib/utils/service.py
+++ b/odl-pipeline/lib/utils/service.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/shutil.py b/odl-pipeline/lib/utils/shutil.py
index 5f6d482..787820e 100755
--- a/odl-pipeline/lib/utils/shutil.py
+++ b/odl-pipeline/lib/utils/shutil.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/ssh_client.py b/odl-pipeline/lib/utils/ssh_client.py
index 464a74e..b38bc37 100755
--- a/odl-pipeline/lib/utils/ssh_client.py
+++ b/odl-pipeline/lib/utils/ssh_client.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/ssh_util.py b/odl-pipeline/lib/utils/ssh_util.py
index 635a718..4de4e52 100755
--- a/odl-pipeline/lib/utils/ssh_util.py
+++ b/odl-pipeline/lib/utils/ssh_util.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/tripleo_helper.py b/odl-pipeline/lib/utils/tripleo_helper.py
index 702e811..0c5695e 100644
--- a/odl-pipeline/lib/utils/tripleo_helper.py
+++ b/odl-pipeline/lib/utils/tripleo_helper.py
@@ -1,3 +1,12 @@
+#
+# Copyright (c) 2017 All rights reserved
+# This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+#
import re
import processutils
from processutils import execute
@@ -23,12 +32,12 @@ class TripleoHelper():
@staticmethod
def get_virtual_node_name_from_mac(mac):
vnode_names, _ = execute('virsh list|awk \'{print '
- '$2}\'', shell=True)
+ '$2}\'', shell=True, as_root=True)
for node in vnode_names.split('\n'):
if 'baremetal' in node:
admin_net_mac, _ = execute(
'virsh domiflist %s |grep admin |awk \'{print $5}\''
- % node, shell=True)
+ % node, shell=True, as_root=True)
if admin_net_mac.replace('\n', '') == mac:
return node
raise Exception('Could not find corresponding virtual node for MAC: %s'
@@ -36,16 +45,18 @@ class TripleoHelper():
@staticmethod
def get_undercloud_ip():
- out, _ = execute('virsh domifaddr undercloud', shell=True)
+ out, _ = execute('virsh domifaddr undercloud', shell=True,
+ as_root=True)
return re.findall('([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)', out)[0]
@staticmethod
def get_undercloud():
return Node('undercloud', address=TripleoHelper.get_undercloud_ip(),
- user='stack')
+ user='stack', password='stack')
class TripleOHelperException(Exception):
+
def __init__(self, value):
self.value = value
diff --git a/odl-pipeline/lib/utils/utils_log.py b/odl-pipeline/lib/utils/utils_log.py
index 9d7648f..64590a0 100755
--- a/odl-pipeline/lib/utils/utils_log.py
+++ b/odl-pipeline/lib/utils/utils_log.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at
diff --git a/odl-pipeline/lib/utils/utils_yaml.py b/odl-pipeline/lib/utils/utils_yaml.py
index b9357f6..e5b42af 100755
--- a/odl-pipeline/lib/utils/utils_yaml.py
+++ b/odl-pipeline/lib/utils/utils_yaml.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015 All rights reserved
+# Copyright (c) 2017 All rights reserved
# This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
# which accompanies this distribution, and is available at