aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--opnfv/deployment/OSA/__init__.py0
-rw-r--r--opnfv/deployment/OSA/adapter.py76
-rw-r--r--opnfv/deployment/factory.py7
3 files changed, 82 insertions, 1 deletions
diff --git a/opnfv/deployment/OSA/__init__.py b/opnfv/deployment/OSA/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/opnfv/deployment/OSA/__init__.py
diff --git a/opnfv/deployment/OSA/adapter.py b/opnfv/deployment/OSA/adapter.py
new file mode 100644
index 0000000..e98526c
--- /dev/null
+++ b/opnfv/deployment/OSA/adapter.py
@@ -0,0 +1,76 @@
+##############################################################################
+# Copyright (c) 2017 SUSE Linux GmbH
+# Author: Manuel Buil (mbuil@suse.com)
+# 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
+##############################################################################
+
+
+from opnfv.deployment import manager
+from opnfv.utils import opnfv_logger as logger
+from opnfv.utils import ssh_utils
+import yaml
+
+logger = logger.Logger(__name__).getLogger()
+
+
+class OSAAdapter(manager.DeploymentHandler):
+
+ def __init__(self, installer_ip, installer_user, pkey_file):
+ self.SOURCE_PATH_UC = "/etc/openstack_deploy/openstack_user_config.yml"
+ self.DEST_PATH_UC = "/tmp/openstack_user_config.yml"
+ super(OSAAdapter, self).__init__(installer='osa',
+ installer_ip=installer_ip,
+ installer_user=installer_user,
+ installer_pwd=None,
+ pkey_file=pkey_file)
+
+ def _find_nodes(self, file):
+ nodes = file['compute_hosts']
+ controllers = file['haproxy_hosts']
+ for controller in controllers:
+ nodes[controller] = controllers[controller]
+ return nodes
+
+ def _process_nodes(self, raw_nodes):
+ nodes = []
+
+ for node in raw_nodes:
+ name = node
+ ip = raw_nodes[node]['ip']
+ # TODO when xci provides status and id of nodes add logic
+ status = 'active'
+ id = None
+ if 'controller' in node:
+ roles = 'controller'
+ elif 'compute' in node:
+ roles = 'compute'
+ ssh_client = ssh_utils.get_ssh_client(hostname=ip,
+ username=self.installer_user,
+ pkey_file=self.pkey_file)
+ node = manager.Node(id, ip, name, status, roles, ssh_client)
+ nodes.append(node)
+
+ return nodes
+
+ def get_nodes(self, options=None):
+ try:
+ # if we have retrieved previously all the nodes, don't do it again
+ # This fails the first time when the constructor calls this method
+ # therefore the try/except
+ if len(self.nodes) > 0:
+ return self.nodes
+ except:
+ pass
+
+ self.installer_node.get_file(self.SOURCE_PATH_UC, self.DEST_PATH_UC)
+ with open(self.DEST_PATH_UC, 'r') as stream:
+ try:
+ file = yaml.load(stream)
+ raw_nodes = self._find_nodes(file)
+ except yaml.YAMLError as exc:
+ logger.error(exc)
+ nodes = self._process_nodes(raw_nodes)
+ return nodes
diff --git a/opnfv/deployment/factory.py b/opnfv/deployment/factory.py
index b8e5c8e..55fb2e2 100644
--- a/opnfv/deployment/factory.py
+++ b/opnfv/deployment/factory.py
@@ -11,6 +11,7 @@
from opnfv.deployment.apex import adapter as apex_adapter
from opnfv.deployment.compass import adapter as compass_adapter
from opnfv.deployment.fuel import adapter as fuel_adapter
+from opnfv.deployment.OSA import adapter as osa_adapter
from opnfv.utils import opnfv_logger as logger
logger = logger.Logger(__name__).getLogger()
@@ -18,7 +19,7 @@ logger = logger.Logger(__name__).getLogger()
class Factory(object):
- INSTALLERS = ["fuel", "apex", "compass", "joid", "daisy"]
+ INSTALLERS = ["fuel", "apex", "compass", "joid", "daisy", "OSA"]
def __init__(self):
pass
@@ -46,6 +47,10 @@ class Factory(object):
installer_ip=installer_ip,
installer_user=installer_user,
installer_pwd=installer_pwd)
+ elif installer.lower() == "osa":
+ return osa_adapter.OSAAdapter(installer_ip=installer_ip,
+ installer_user=installer_user,
+ pkey_file=pkey_file)
else:
raise Exception("Installer adapter is not implemented for "
"the given installer.")