From a98110b454b34f38561aa4ee9fa67a2dc875b74f Mon Sep 17 00:00:00 2001 From: Jan Scotka Date: Jun 09 2017 10:47:04 +0000 Subject: added functions to get architectures --- diff --git a/moduleframework/common.py b/moduleframework/common.py index d0a494f..13d71a4 100644 --- a/moduleframework/common.py +++ b/moduleframework/common.py @@ -89,6 +89,7 @@ hostpackager = "yum -y" guestpackager = "microdnf" if os.path.exists('/usr/bin/dnf'): hostpackager = "dnf -y" +ARCH = "x86_64" # translation table for config.yaml files syntax is {VARIABLE} in config file trans_dict = {"HOSTIPADDR": hostipaddr, @@ -100,10 +101,12 @@ trans_dict = {"HOSTIPADDR": hostipaddr, "PASSWORD": dpassword, "DATABASENAME": ddatabase, "HOSTPACKAGER": hostpackager, - "GUESTPACKAGER": guestpackager + "GUESTPACKAGER": guestpackager, + "GUESTARCH": ARCH, + "HOSTARCH": ARCH } -ARCH = "x86_64" + PDCURL = "https://pdc.fedoraproject.org/rest_api/v1/unreleasedvariants" REPOMD = "repodata/repomd.xml" MODULEFILE = 'tempmodule.yaml' diff --git a/moduleframework/module_framework.py b/moduleframework/module_framework.py index 661bb91..a254aa2 100644 --- a/moduleframework/module_framework.py +++ b/moduleframework/module_framework.py @@ -73,8 +73,14 @@ class CommonFunctions(object): self.modulemdConf = None self.moduleName = None self.source = None + self.arch = None # general use case is to have forwarded services to host (so thats why it is same) self.ipaddr = trans_dict["HOSTIPADDR"] + trans_dict["GUESTARCH"] = self.getArch() + + def getArch(self): + out = self.runHost(command='uname -m', verbose=False).stdout.strip() + return out def runHost(self, command="ls /", **kwargs): """ @@ -205,6 +211,8 @@ class CommonFunctions(object): return self.ipaddr + + class ContainerHelper(CommonFunctions): """ Basic Helper class for Docker container module type @@ -1202,6 +1210,13 @@ class AvocadoTest(Test): """ return self.backend.getIPaddr(*args, **kwargs) + def getArch(self): + """ + It returns architecture indentificatior + :return: str + """ + return self.backend.getArch() + # INTERFACE CLASSES FOR SPECIFIC MODULE TESTS class ContainerAvocadoTest(AvocadoTest):