[PATCH 01/19] PerfRepo: use UTC time

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

People from different time zones can use the same PerfRepo instance,
automatically using UTC time stamps will avoid incorrect sorting of
results (by date).

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index e244321..4418902 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -121,7 +121,7 @@ class PerfRepoTestExecution(PerfRepoObject):
         if type(xml) is NoneType:
             self._id = None
             self._name = None
-            self._started = datetime.datetime.now().isoformat()
+            self._started = datetime.datetime.utcnow().isoformat()
             self._testId = None
             self._testUid = None
             self._comment = ""
@@ -173,7 +173,7 @@ class PerfRepoTestExecution(PerfRepoObject):
 
     def set_started(self, date=None):
         if isinstance(date, NoneType):
-            date = datetime.datetime.now()
+            date = datetime.datetime.utcnow().isoformat()
             self._started = date.isoformat()
         else:
             self._started = date
-- 
2.5.2

[PATCH 02/19] PerfRepo: add user to Reports

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

For some reason, Report objects, need a 'user' attribute to be
successfully sent to PerfRepo, even though GET request doesn't contain
this attribute. Adding for later use.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 4418902..370f4f6 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -373,6 +373,7 @@ class PerfRepoMetric(PerfRepoObject):
 class PerfRepoReport(PerfRepoObject):
     def __init__(self, xml=None):
         self._baselines = []
+        self._user = None
         if type(xml) is NoneType:
             self._id = None
             self._name = None
-- 
2.5.2

[PATCH 03/19] PerfRepo: add get_obj_url method

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This method can be used to get the web accessible URL (not REST API url)
of a PerfRepo object. This will be usefull for printing information
about the objects.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 370f4f6..03e9a62 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -27,6 +27,9 @@ class PerfRepoObject(object):
     def __init__(self):
         pass
 
+    def get_obj_url(self):
+        return "/"
+
     def _set_element_atrib(self, element, name, value):
         if value != None:
             element.set(name, value)
@@ -69,6 +72,9 @@ class PerfRepoTest(PerfRepoObject):
             raise PerfRepoException("Parameter xml must be"\
                                     " a string, an Element or None")
 
+    def get_obj_url(self):
+        return "/test/%s" % self._id
+
     def get_id(self):
         return self._id
 
@@ -165,6 +171,9 @@ class PerfRepoTestExecution(PerfRepoObject):
             raise PerfRepoException("Parameter xml must be"\
                                     " a string, an Element or None")
 
+    def get_obj_url(self):
+        return "/exec/%s" % self._id
+
     def set_id(self, id):
         self._id = id
 
@@ -417,6 +426,9 @@ class PerfRepoReport(PerfRepoObject):
     def get_baseline(self, index=-1):
         return self._baselines[index]
 
+    def get_obj_url(self):
+        return "/reports/%s/%s" % (self._type.lower(), self._id)
+
 class PerfRepoRESTAPI(object):
     '''Wrapper class for the REST API provided by PerfRepo'''
     def __init__(self, url, user, password):
@@ -429,6 +441,9 @@ class PerfRepoRESTAPI(object):
         self._session.stream = True
         self._session.headers['Content-Type'] = 'text/xml'
 
+    def get_obj_url(self, obj):
+        return self._url + obj.get_obj_url()
+
     def test_get_by_id(self, test_id):
         get_url = self._url + '/rest/test/id/%s' % test_id
         response = self._session.get(get_url)
-- 
2.5.2

[PATCH 04/19] PerfRepo: add pretty xml printing to base PerfRepoObject

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Very useful for debugging of what is being sent to the PerfRepo
instance.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 03e9a62..6da8190 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -14,6 +14,7 @@ import requests
 import datetime
 import re
 import logging
+import xml.dom.minidom
 from types import StringType, NoneType
 from xml.etree import ElementTree
 from xml.etree.ElementTree import Element
@@ -41,6 +42,13 @@ class PerfRepoObject(object):
         root = self.to_xml()
         return ElementTree.tostring(root)
 
+    def to_pretty_xml_string(self):
+        tmp_xml = xml.dom.minidom.parseString(self.to_xml_string())
+        return tmp_xml.toprettyxml()
+
+    def __str__(self):
+        return self.to_pretty_xml_string()
+
 class PerfRepoTest(PerfRepoObject):
     def __init__(self, xml=None):
         if type(xml) is NoneType:
-- 
2.5.2

[PATCH 05/19] PerfRepo: add to_xml method to PerfRepoReport class

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Needed for POST requests to PerfRepo, such as create or update.

Also adding the __str__ method that uses pprint to display the object in
a nice not-XML fashion.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 6da8190..f409b04 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -15,11 +15,13 @@ import datetime
 import re
 import logging
 import xml.dom.minidom
+import textwrap
+import pprint
 from types import StringType, NoneType
 from xml.etree import ElementTree
 from xml.etree.ElementTree import Element
 from lnst.Common.Utils import recursive_dict_update
-from lnst.Common.Utils import dot_to_dict
+from lnst.Common.Utils import dot_to_dict, dict_to_dot
 
 class PerfRepoException(Exception):
     pass
@@ -437,6 +439,40 @@ class PerfRepoReport(PerfRepoObject):
     def get_obj_url(self):
         return "/reports/%s/%s" % (self._type.lower(), self._id)
 
+    def to_xml(self):
+        root = Element('report')
+        self._set_element_atrib(root, 'id', self._id)
+        self._set_element_atrib(root, 'name', self._name)
+        self._set_element_atrib(root, 'type', self._type)
+        self._set_element_atrib(root, 'user', self._user)
+
+        properties = ElementTree.SubElement(root, 'properties')
+        dot_props = dict_to_dot(self._properties)
+        for prop in dot_props:
+            entry_elem = ElementTree.SubElement(properties, 'entry')
+            key_elem = ElementTree.SubElement(entry_elem, 'key')
+            value_elem = ElementTree.SubElement(entry_elem, 'value')
+
+            key_elem.text = prop[0]
+            self._set_element_atrib(value_elem, "name", prop[0])
+            self._set_element_atrib(value_elem, "value", prop[1])
+
+        return root
+
+    def __str__(self):
+        str_props = pprint.pformat(self._properties)
+        ret_str = """\
+                  id = %s
+                  name = %s
+                  type = %s
+                  properties =
+                  """ % ( self._id,
+                          self._name,
+                          self._type)
+        ret_str = textwrap.dedent(ret_str)
+        ret_str += str_props
+        return textwrap.dedent(ret_str)
+
 class PerfRepoRESTAPI(object):
     '''Wrapper class for the REST API provided by PerfRepo'''
     def __init__(self, url, user, password):
-- 
2.5.2

[PATCH 06/19] PerfRepo: reimplement Report properties handling

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Until now we only supported getting baselines from the Report
properties, and the implementation was far from ideal.

This patch removes the parsing and moves to working directly with the
dictionary structure, which is a bit better than what we had, and also
adds implementation for other Report properties such as series and
charts.

The patch doesn't break backwards compatibility of the get_baseline method.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 281 +++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 267 insertions(+), 14 deletions(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index f409b04..3bfa2aa 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -391,7 +391,6 @@ class PerfRepoMetric(PerfRepoObject):
 
 class PerfRepoReport(PerfRepoObject):
     def __init__(self, xml=None):
-        self._baselines = []
         self._user = None
         if type(xml) is NoneType:
             self._id = None
@@ -418,26 +417,280 @@ class PerfRepoReport(PerfRepoObject):
                 tmp_dict = dot_to_dict(value_tag.get("name"),
                                        value_tag.get("value"))
                 recursive_dict_update(self._properties, tmp_dict)
-
-            self._parse_baseline_properties()
         else:
             raise PerfRepoException("Parameter xml must be"\
                                     " a string, an Element or None")
 
-    def _parse_baseline_properties(self):
-        chart = self._properties["chart0"] #TODO more charts per report?
-        baseline_re = re.compile(r'baseline(\d+)')
-        for key, value in chart.iteritems():
-            match = baseline_re.match(key)
-            if match is None:
+    def get_obj_url(self):
+        return "/reports/%s/%s" % (self._type.lower(), self._id)
+
+    def _find_max_num(self, str_tmp, search_dict):
+        max_num = -1
+        for key, item in search_dict.items():
+            match = re.match(r'%s(\d)+' % str_tmp, key)
+            if match == None:
                 continue
-            self._baselines.append(value)
+            num = int(match.group(1))
 
-    def get_baseline(self, index=-1):
-        return self._baselines[index]
+            if num > max_num:
+                max_num = num
+        return max_num
 
-    def get_obj_url(self):
-        return "/reports/%s/%s" % (self._type.lower(), self._id)
+    def get_chart(self, chart_num):
+        chart_name = "chart%d" % chart_num
+        for key, chart in self._properties.items():
+            if key == chart_name:
+                return chart
+        return None
+
+    def add_chart(self, name, test_id):
+        max_chart_num = self._find_max_num("chart", self._properties)
+
+        chart_name = "chart%d" % (max_chart_num + 1)
+
+        new_chart = self._properties[chart_name] = {}
+        new_chart["name"] = str(name)
+        new_chart["test"] = str(test_id)
+
+        return new_chart
+
+    def del_chart(self, chart_num):
+        chart_name = "chart%d" % chart_num
+
+        if chart_name in self._properties:
+            chart = self._properties[chart_name]
+            del self._properties[chart_name]
+            return chart
+        else:
+            return None
+
+    def set_chart_name(self, chart_num, name):
+        chart = self.get_chart(chart_num)
+
+        if chart:
+            chart["name"] = name
+            return chart
+        else:
+            return None
+
+    def set_chart_test_id(self, chart_num, test_id):
+        chart = self.get_chart(chart_num)
+
+        if chart:
+            chart["test"] = test_id
+            return chart
+        else:
+            return None
+
+    def get_baseline(self, chart_num=0, index=-1):
+        chart = self.get_chart(chart_num)
+
+        if chart is None:
+            return None
+
+        if index >= 0:
+            baseline_name = "baseline%d" % (index)
+            for key, item in chart.items():
+                if key == baseline_name:
+                    return item
+            return None
+        else:
+            baselines = []
+            for key, item in chart.items():
+                if re.match(r'baseline\d+', key):
+                    baselines.append(item)
+            if abs(index) <= len(baselines):
+                return baselines[index]
+            else:
+                return None
+
+    def add_baseline(self, chart_num, name, exec_id, metric_id):
+        if chart_num is None:
+            chart_num = self._find_max_num("chart", self._properties)
+
+        chart = self.get_chart(chart_num)
+        if chart is None:
+            return None
+
+        max_baseline_num = self._find_max_num("baseline", chart)
+
+        baseline_name = "baseline%d" % (max_baseline_num + 1)
+
+        new_baseline = chart[baseline_name] = {}
+        new_baseline["name"] = str(name)
+        new_baseline["metric"] = str(metric_id)
+        new_baseline["execId"] = str(exec_id)
+
+        return new_baseline
+
+    def del_baseline(self, chart_num, baseline_num):
+        chart = self.get_chart(chart_num)
+        if chart is None:
+            return None
+
+        baseline_name = "baseline%d" % (baseline_num)
+
+        if baseline_name in chart:
+            baseline = chart[baseline_name]
+            del chart[baseline_name]
+            return baseline
+        else:
+            return None
+
+    def set_baseline_name(self, chart_num, baseline_num, name):
+        baseline = self.get_baseline(chart_num, baseline_num)
+
+        if baseline is None:
+            return None
+
+        baseline["name"] = name
+        return baseline
+
+    def set_baseline_metric(self, chart_num, baseline_num, metric_id):
+        baseline = self.get_baseline(chart_num, baseline_num)
+
+        if baseline is None:
+            return None
+
+        baseline["metric"] = metric_id
+        return baseline
+
+    def set_baseline_execid(self, chart_num, baseline_num, exec_id):
+        baseline = self.get_baseline(chart_num, baseline_num)
+
+        if baseline is None:
+            return None
+
+        baseline["execId"] = exec_id
+        return baseline
+
+    def add_series(self, chart_num, name, metric_id, tags=[]):
+        if chart_num is None:
+            chart_num = self._find_max_num("chart", self._properties)
+
+        chart = self.get_chart(chart_num)
+        if chart is None:
+            return None
+
+        max_series_num = self._find_max_num("series", chart)
+
+        series_name = "series%d" % (max_series_num + 1)
+
+        new_series = chart[series_name] = {}
+        new_series["name"] = name
+        new_series["metric"] = metric_id
+        new_series["tags"] = " ".join(tags)
+
+        return new_series
+
+    def get_series(self, chart_num, series_num):
+        chart = self.get_chart(chart_num)
+        if chart is None:
+            return None
+
+        series_name = "series%d" % int(series_num)
+        for key, item in chart.items():
+            if key == series_name:
+                return item
+        return None
+
+    def del_series(self, chart_num, series_num):
+        if chart_num is None:
+            chart_num = self._find_max_num("chart", self._properties)
+
+        chart = self.get_chart(chart_num)
+        if chart is None:
+            return None
+
+        series_name = "series%d" % (series_num)
+
+        if series_name in chart:
+            series = chart[series_name]
+            del chart[series_name]
+            return series
+        else:
+            return None
+
+    def set_series_name(self, chart_num, series_num, name):
+        series = self.get_series(chart_num, series_num)
+
+        if series is None:
+            return None
+
+        series["name"] = name
+        return series
+
+    def set_series_metric(self, chart_num, series_num, metric_id):
+        series = self.get_series(chart_num, series_num)
+
+        if series is None:
+            return None
+
+        series["metric"] = metric_id
+        return series
+
+    def set_series_tags(self, chart_num, series_num, tags):
+        series = self.get_series(chart_num, series_num)
+
+        if series is None:
+            return None
+
+        series["tags"] = " ".join(tags)
+        return series
+
+    def remove_series_tags(self, chart_num, series_num, remove_tags):
+        series = self.get_series(chart_num, series_num)
+
+        if series is None:
+            return None
+
+        tags = series["tags"].split(" ")
+
+        for tag in remove_tags:
+            for i in range(tags.count(tag)):
+                tags.remove(tag)
+
+        series["tags"] = " ".join(tags)
+        return series
+
+    def add_series_tags(self, chart_num, series_num, add_tags):
+        series = self.get_series(chart_num, series_num)
+
+        if series is None:
+            return None
+
+        tags = series["tags"].split(" ")
+
+        for tag in add_tags:
+            if tags.count(tag) == 0:
+                tags.append(tag)
+
+        series["tags"] = " ".join(tags)
+        return series
+
+    def set_id(self, new_id=None):
+        self._id = new_id
+
+    def get_id(self):
+        return self._id
+
+    def set_name(self, new_name=None):
+        self._name = new_name
+
+    def get_name(self):
+        return self._name
+
+    def set_type(self, new_type=None):
+        self._type = new_type
+
+    def get_type(self):
+        return self._type
+
+    def set_user(self, new_user=None):
+        self._user = new_user
+
+    def get_user(self):
+        return self._user
 
     def to_xml(self):
         root = Element('report')
-- 
2.5.2

[PATCH 07/19] PerfRepo: fix set id for successfull create calls

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Looks like I used the entire Location header instead of just the id at
the end.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 3bfa2aa..902820d 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -766,7 +766,8 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
-            test.set_id(response.headers['Location'])
+            new_id = response.headers["Location"].split('/')[-1]
+            test.set_id(new_id)
             return test
 
     def test_add_metric(self, test_id, metric):
@@ -776,7 +777,8 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
-            metric.set_id(response.headers['Location'])
+            new_id = response.headers["Location"].split('/')[-1]
+            metric.set_id(new_id)
             return metric
 
     def test_remove(self, test_id):
@@ -812,7 +814,8 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
-            testExec.set_id(response.headers['Location'])
+            new_id = response.headers["Location"].split('/')[-1]
+            testExec.set_id(new_id)
             return testExec
 
     def testExecution_delete(self, testExec_id):
-- 
2.5.2

[PATCH 08/19] PerfRepo: implement the report_create REST method

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The method follows the example of other create methods that we already
have. One speciality is the addition of the set_user call, since the
user attribute is only required for Report objects.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 902820d..5c3b905 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -854,10 +854,18 @@ class PerfRepoRESTAPI(object):
             return PerfRepoReport(response.content)
 
     def report_create(self, report):
-        #TODO not needed yet and therefore not tested
         post_url = self._url + '/rest/report/create'
-        self._session.post(post_url, data=report)
-        return None
+
+        report.set_user(self._user)
+
+        response = self._session.post(post_url, data=report.to_xml_string())
+        if response.status_code != 201:
+            logging.debug(response.text)
+            return None
+        else:
+            new_id = response.headers["Location"].split('/')[-1]
+            report.set_id(new_id)
+            return report
 
     def report_delete(self, report_id):
         #TODO not needed yet and therefore not tested
-- 
2.5.2

[PATCH 09/19] PerfRepo: add report_update REST method

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This is now implemented in the PerfRepo master branch and will be very
usefull when used from the CLI application.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 5c3b905..8ca47fb 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -867,6 +867,18 @@ class PerfRepoRESTAPI(object):
             report.set_id(new_id)
             return report
 
+    def report_update(self, report):
+        post_url = self._url + '/rest/report/update/%s' % report.get_id()
+
+        report.set_user(self._user)
+
+        response = self._session.post(post_url, data=report.to_xml_string())
+        if response.status_code != 201:
+            logging.debug(response.text)
+            return None
+        else:
+            return report
+
     def report_delete(self, report_id):
         #TODO not needed yet and therefore not tested
         delete_url = self._url + '/rest/report/delete'
-- 
2.5.2

[PATCH 10/19] Utils: add indent function

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Very simple implementation of adding space indentation to multiline
strings. Will be used when pretty printing PerfRepo objects.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Common/Utils.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lnst/Common/Utils.py b/lnst/Common/Utils.py
index 22d2925..ceb01a3 100644
--- a/lnst/Common/Utils.py
+++ b/lnst/Common/Utils.py
@@ -290,3 +290,9 @@ def is_installed(program):
         return True
     except subprocess.CalledProcessError:
         return False
+
+def indent(string, spaces):
+    ret_str = ""
+    for line in string.split("\n"):
+        ret_str += " "*spaces + line + "\n"
+    return ret_str
-- 
2.5.2

[PATCH 11/19] PerfRepo: implement __str__ methods for remaining classes

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Implement specific __str__ methods for the remaining PerfRepo objects.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 72 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 71 insertions(+), 1 deletion(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 8ca47fb..f05884a 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -21,7 +21,7 @@ from types import StringType, NoneType
 from xml.etree import ElementTree
 from xml.etree.ElementTree import Element
 from lnst.Common.Utils import recursive_dict_update
-from lnst.Common.Utils import dot_to_dict, dict_to_dot
+from lnst.Common.Utils import dot_to_dict, dict_to_dot, indent
 
 class PerfRepoException(Exception):
     pass
@@ -132,6 +132,25 @@ class PerfRepoTest(PerfRepoObject):
 
         return root
 
+    def __str__(self):
+        ret_str = """\
+                  id = %s
+                  uid = %s
+                  name = %s
+                  groupid = %s
+                  description:
+                  """ % ( self._id,
+                          self._uid,
+                          self._name,
+                          self._groupid)
+        ret_str = textwrap.dedent(ret_str)
+        ret_str += indent(self._description, 4)
+        ret_str += "metrics:\n"
+        for metric in self._metrics:
+            ret_str +=  indent(str(metric), 4)
+            ret_str +=  indent("------------------------", 4)
+        return textwrap.dedent(ret_str)
+
 class PerfRepoTestExecution(PerfRepoObject):
     def __init__(self, xml=None):
         if type(xml) is NoneType:
@@ -265,6 +284,32 @@ class PerfRepoTestExecution(PerfRepoObject):
 
         return root
 
+    def __str__(self):
+        ret_str = """\
+                  id = %s
+                  name = %s
+                  date = %s
+                  testId = %s
+                  testUid = %s
+                  comment = %s
+                  tags = %s
+                  """ % ( self._id,
+                          self._name,
+                          self._started,
+                          self._testId,
+                          self._testUid,
+                          self._comment,
+                          " ".join(self._tags))
+        ret_str = textwrap.dedent(ret_str)
+        ret_str += "parameters:\n"
+        for param in self._parameters:
+            ret_str +=  indent("%s = %s" % (param[0], param[1]), 4)
+        ret_str += "values:\n"
+        for val in self._values:
+            ret_str +=  indent(str(val), 4)
+            ret_str +=  indent("------------------------", 4)
+        return textwrap.dedent(ret_str)
+
 class PerfRepoValue(PerfRepoObject):
     def __init__(self, xml=None):
         if type(xml) is NoneType:
@@ -330,6 +375,18 @@ class PerfRepoValue(PerfRepoObject):
             self._set_element_atrib(param_elem, "value", param[1])
         return root
 
+    def __str__(self):
+        ret_str = """\
+                  metric name = %s
+                  result = %s
+                  """ % ( self._metricName,
+                          self._result)
+        ret_str = textwrap.dedent(ret_str)
+        ret_str += "parameters:\n"
+        for param in self._parameters:
+            ret_str +=  indent("%s = %s" % (param[0], param[1]), 4)
+        return textwrap.dedent(ret_str)
+
 class PerfRepoMetric(PerfRepoObject):
     def __init__(self, xml=None):
         if type(xml) is NoneType:
@@ -389,6 +446,19 @@ class PerfRepoMetric(PerfRepoObject):
 
         return root
 
+    def __str__(self):
+        ret_str = """\
+                  id = %s
+                  name = %s
+                  comparator = %s
+                  description:
+                  """ % ( self._id,
+                          self._name,
+                          self._comparator)
+        ret_str = textwrap.dedent(ret_str)
+        ret_str += indent(self._description, 4)
+        return ret_str
+
 class PerfRepoReport(PerfRepoObject):
     def __init__(self, xml=None):
         self._user = None
-- 
2.5.2

[PATCH 12/19] PerfRepo: add log messages to PerfRepoRESTAPI

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Basic log messages to improve usability.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index f05884a..ba3fd64 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -818,6 +818,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("GET %s success" % get_url)
             return PerfRepoTest(response.content)
 
     def test_get_by_uid(self, test_uid):
@@ -827,6 +828,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("GET %s success" % get_url)
             return PerfRepoTest(response.content)
 
     def test_create(self, test):
@@ -838,6 +840,8 @@ class PerfRepoRESTAPI(object):
         else:
             new_id = response.headers["Location"].split('/')[-1]
             test.set_id(new_id)
+            logging.info("POST %s success" % post_url)
+            logging.info("Obj url: %s" % self.get_obj_url(test))
             return test
 
     def test_add_metric(self, test_id, metric):
@@ -849,6 +853,8 @@ class PerfRepoRESTAPI(object):
         else:
             new_id = response.headers["Location"].split('/')[-1]
             metric.set_id(new_id)
+            logging.info("POST %s success" % post_url)
+            logging.info("Obj url: %s" % self.get_obj_url(test))
             return metric
 
     def test_remove(self, test_id):
@@ -857,6 +863,7 @@ class PerfRepoRESTAPI(object):
         if response.status_code != 204:
             return False
         else:
+            logging.info("DELETE %s success" % delete_url)
             return True
 
     def metric_get(self, metric_id):
@@ -866,6 +873,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("GET %s success" % get_url)
             return PerfRepoMetric(response.content)
 
     def testExecution_get(self, testExec_id):
@@ -875,6 +883,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("GET %s success" % get_url)
             return PerfRepoTestExecution(response.content)
 
     def testExecution_create(self, testExec):
@@ -886,6 +895,8 @@ class PerfRepoRESTAPI(object):
         else:
             new_id = response.headers["Location"].split('/')[-1]
             testExec.set_id(new_id)
+            logging.info("POST %s success" % post_url)
+            logging.info("Obj url: %s" % self.get_obj_url(testExec))
             return testExec
 
     def testExecution_delete(self, testExec_id):
@@ -895,6 +906,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return False
         else:
+            logging.info("DELETE %s success" % delete_url)
             return True
 
     def testExecution_add_value(self, value):
@@ -921,6 +933,7 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("GET %s success" % get_url)
             return PerfRepoReport(response.content)
 
     def report_create(self, report):
@@ -935,6 +948,8 @@ class PerfRepoRESTAPI(object):
         else:
             new_id = response.headers["Location"].split('/')[-1]
             report.set_id(new_id)
+            logging.info("POST %s success" % post_url)
+            logging.info("Obj url: %s" % self.get_obj_url(report))
             return report
 
     def report_update(self, report):
@@ -947,6 +962,8 @@ class PerfRepoRESTAPI(object):
             logging.debug(response.text)
             return None
         else:
+            logging.info("UPDATE %s success" % post_url)
+            logging.info("Obj url: %s" % self.get_obj_url(report))
             return report
 
     def report_delete(self, report_id):
-- 
2.5.2

[PATCH 13/19] PerfRepo: implement report_delete_by_id method

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Renamed from report_delete. The method is now tested and usable.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index ba3fd64..3aca991 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -966,8 +966,11 @@ class PerfRepoRESTAPI(object):
             logging.info("Obj url: %s" % self.get_obj_url(report))
             return report
 
-    def report_delete(self, report_id):
-        #TODO not needed yet and therefore not tested
-        delete_url = self._url + '/rest/report/delete'
-        self._session.delete(post_url)
-        return None
+    def report_delete_by_id(self, report_id):
+        delete_url = self._url + '/rest/report/id/%s' % report_id
+        response = self._session.delete(delete_url)
+        if response.status_code != 204:
+            return False
+        else:
+            logging.info("DELETE %s success" % delete_url)
+            return True
-- 
2.5.2

[PATCH 14/19] PerfRepo: add missing get methods

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Some PerfRepo objects were missing a few get methods for their
attributes. This patch fixes that.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index 3aca991..f7949d0 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -118,6 +118,13 @@ class PerfRepoTest(PerfRepoObject):
     def set_groupid(self, groupid):
         self._groupid = groupid
 
+    def add_metric(self, metric):
+        if not isinstance(metric, PerfRepoMetric):
+            return None
+        else:
+            self._metrics.append(metric)
+            return metric
+
     def to_xml(self):
         root = Element('test')
         self._set_element_atrib(root, 'id', self._id)
@@ -206,9 +213,15 @@ class PerfRepoTestExecution(PerfRepoObject):
     def set_id(self, id):
         self._id = id
 
+    def get_id(self):
+        return self._id
+
     def set_name(self, name):
         self._name = name
 
+    def get_name(self):
+        return self._name
+
     def set_started(self, date=None):
         if isinstance(date, NoneType):
             date = datetime.datetime.utcnow().isoformat()
@@ -216,12 +229,18 @@ class PerfRepoTestExecution(PerfRepoObject):
         else:
             self._started = date
 
+    def get_started(self):
+        return self._started
+
     def set_testId(self, testId):
         if isinstance(testId, PerfRepoTest):
             self._testId = testId.get_id()
         else:
             self._testId = testId
 
+    def get_testId(self):
+        return self._testId
+
     def set_testUid(self, testUid):
         if isinstance(testUid, PerfRepoTest):
             self._testUid = testUid.get_uid()
@@ -234,6 +253,9 @@ class PerfRepoTestExecution(PerfRepoObject):
     def set_comment(self, comment):
         self._comment = comment
 
+    def get_comment(self):
+        return self._comment
+
     def add_value(self, value):
         self._values.append(value)
 
@@ -352,6 +374,9 @@ class PerfRepoValue(PerfRepoObject):
     def add_parameter(self, name, value):
         self._parameters.append((name, value))
 
+    def get_parameters(self):
+        return self._parameters
+
     def get_metricName(self):
         return self._metricName
 
-- 
2.5.2

[PATCH 15/19] PerfRepo: fix get_obj_url method

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The method would crash if obj was not an object descended from the
PerfRepoObject class. This patch fixes the problem by checking the type
of the object.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index f7949d0..dac186d 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -834,6 +834,8 @@ class PerfRepoRESTAPI(object):
         self._session.headers['Content-Type'] = 'text/xml'
 
     def get_obj_url(self, obj):
+        if not isinstance(obj, PerfRepoObject):
+            return ""
         return self._url + obj.get_obj_url()
 
     def test_get_by_id(self, test_id):
-- 
2.5.2

[PATCH 16/19] PerfRepo: rename test_remove to test_delete

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Making the naming consistent since every other delete method is named
<obj>_delete.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Controller/PerfRepo.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
index dac186d..c4528dc 100644
--- a/lnst/Controller/PerfRepo.py
+++ b/lnst/Controller/PerfRepo.py
@@ -884,7 +884,7 @@ class PerfRepoRESTAPI(object):
             logging.info("Obj url: %s" % self.get_obj_url(test))
             return metric
 
-    def test_remove(self, test_id):
+    def test_delete(self, test_id):
         delete_url = self._url + '/rest/test/id/%s' % test_id
         response = self._session.delete(delete_url)
         if response.status_code != 204:
-- 
2.5.2

[PATCH 17/19] add perfrepo: CLI application for PerfRepo access

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This is a new application that gives us control over PerfRepo from the
command line. At the moment it is capable of getting, creating and
updating Report objects. More features will come soon.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 perfrepo | 519 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 519 insertions(+)
 create mode 100755 perfrepo

diff --git a/perfrepo b/perfrepo
new file mode 100755
index 0000000..cda306c
--- /dev/null
+++ b/perfrepo
@@ -0,0 +1,519 @@
+#! /usr/bin/env python2
+"""
+
+Copyright 2015 Red Hat, Inc.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+from __future__ import print_function
+
+__author__ = """
+olichtne(a)redhat.com (Ondrej Lichtner)
+"""
+
+import sys
+import logging
+import os
+import re
+import datetime
+import lnst.Controller.PerfRepo as PerfRepo
+from lnst.Controller.PerfRepo import PerfRepoRESTAPI
+from lnst.Common.Config import lnst_config
+
+def usage(retval=0):
+    """
+    Print usage of this app
+    """
+    print("Usage: %s [OPTIONS...] OBJECT {COMMAND | help} [COMMAND_OPTS]" %
sys.argv[0], file=sys.stderr)
+    print("", file=sys.stderr)
+    print("OBJECT := { report | testexec | test }", file=sys.stderr)
+    print("OPTIONS := { -u URL | --url URL |", file=sys.stderr)
+    print("             -n USERNAME | --username USERNAME |", file=sys.stderr)
+    print("             -p PASSWORD | --password PASSWORD |", file=sys.stderr)
+    print("             -c FILE | --config FILE}", file=sys.stderr)
+    sys.exit(retval)
+
+
+class GenericCLI(object):
+    def __init__(self, url, username, password, argv):
+        if url is not None:
+            self._url = url
+        else:
+            self._url = lnst_config.get_option("perfrepo", "url")
+
+        if username is not None:
+            self._username = username
+        else:
+            self._username = lnst_config.get_option("perfrepo",
"username")
+
+        if password is not None:
+            self._password = password
+        else:
+            self._password = lnst_config.get_option("perfrepo",
"password")
+
+        self._argv = argv
+        self._perf_api = PerfRepoRESTAPI(self._url,
+                                         self._username,
+                                         self._password)
+
+    def print_help(self):
+        pass
+
+    def run(self):
+        print("Not implemented yet!", file=sys.stderr)
+        self.print_help()
+        return -1
+
+class TestCLI(GenericCLI):
+    pass
+
+class TestExecCLI(GenericCLI):
+    pass
+
+class ReportCLI(GenericCLI):
+    def print_help(self):
+        """
+        Print usage for the report object
+        """
+        print("Usage: %s report help" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s report get ID" % sys.argv[0], file=sys.stderr)
+        print("       %s report show ID" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s report create" % sys.argv[0], file=sys.stderr)
+        print("                     name NAME [type TYPE]", file=sys.stderr)
+        print("                         chart NAME", file=sys.stderr)
+        print("                         {testid ID | testuid UID}",
file=sys.stderr)
+        print("                             series NAME", file=sys.stderr)
+        print("                                    metric ID",
file=sys.stderr)
+        print("                                    tags TAG[,TAG,...]",
file=sys.stderr)
+        print("                             baseline NAME", file=sys.stderr)
+        print("                                    execid ID",
file=sys.stderr)
+        print("                                    metric ID",
file=sys.stderr)
+        print("       %s report update" % sys.argv[0], file=sys.stderr)
+        print("                     id ID", file=sys.stderr)
+        print("                         [name NAME]", file=sys.stderr)
+        print("                         OP chart [NUM | NAME]",
file=sys.stderr)
+        print("                         [testid ID | testuid UID]",
file=sys.stderr)
+        print("                             [name NAME]", file=sys.stderr)
+        print("                             [ OP series [NUM | NAME] ]",
file=sys.stderr)
+        print("                                    [name NAME]",
file=sys.stderr)
+        print("                                    [metric ID]",
file=sys.stderr)
+        print("                                    [+tags TAG[,TAG,...] ]",
file=sys.stderr)
+        print("                                    [-tags TAG[,TAG,...] ]",
file=sys.stderr)
+        print("                             [ OP baseline [ NUM | NAME] ]",
file=sys.stderr)
+        print("                                    [name NAME]",
file=sys.stderr)
+        print("                                    [execid ID]",
file=sys.stderr)
+        print("                                    [metric ID]",
file=sys.stderr)
+        print("                     WHERE OP is [add | del | edit]",
file=sys.stderr)
+        print("                     edit is implicit - noOP == 'edit'",
file=sys.stderr)
+        print("                     OPs 'edit' and 'del' require
NUM, whereas 'add' requires NAME", file=sys.stderr)
+        print("                     if chart OP == 'add' then all further
OPs are 'add' as in the 'report create' command", file=sys.stderr)
+
+    def _parse_baseline(self, argv):
+        baseline = {}
+        baseline["name"] = argv[0]
+
+        i = 1
+        try:
+            while i < len(argv):
+                if argv[i] == "execid":
+                    baseline["execid"] = argv[i+1]
+                    i += 2
+                    continue
+                elif argv[i] == "metric":
+                    baseline["metric"] = argv[i+1]
+                    i += 2
+                    continue
+                else:
+                    return (baseline, i)
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return ({}, 0)
+        return (baseline, i)
+
+    def _parse_series(self, argv):
+        series = {"tags": []}
+        series["name"] = argv[0]
+
+        i = 1
+        try:
+            while i < len(argv):
+                if argv[i] == "tags":
+                    tags = argv[i+1].split(",")
+                    series["tags"] = tags
+                    i += 2
+                    continue
+                elif argv[i] == "metric":
+                    series["metric"] = argv[i+1]
+                    i += 2
+                    continue
+                else:
+                    return (series, i)
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return ({}, 0)
+        return (series, i)
+
+    def _parse_chart_add(self, argv):
+        chart = {"series": [], "baselines": []}
+
+        baseline = None
+        series = None
+
+        chart["name"] = argv[0]
+        i = 1
+        try:
+            while i < len(argv):
+                if argv[i] == "testid":
+                    chart["test"] = argv[i+1]
+                    i += 2
+                    continue
+                elif argv[i] == "testuid":
+                    test = self._perf_api.test_get_by_uid(argv[i+1])
+                    chart["test"] = test.get_id()
+                    i += 2
+                    continue
+                elif argv[i] == "series":
+                    series, new_i = self._parse_series(argv[i+1:])
+                    chart["series"].append(series)
+                    i += 1 + new_i
+                elif argv[i] == "baseline":
+                    baseline, new_i = self._parse_baseline(argv[i+1:])
+                    chart["baselines"].append(baseline)
+                    i += 1 + new_i
+                    continue
+                else:
+                    return (chart, i)
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return ({}, 0)
+        return (chart, i)
+
+    def _report_add_chart(self, report, chart):
+        report.add_chart(chart["name"], chart["test"])
+
+        for baseline in chart["baselines"]:
+            try:
+                report.add_baseline(None, baseline["name"],
+                                          baseline["metric"],
+                                          baseline["execid"])
+            except KeyError as e:
+                print("Parameter '%s' is required for a baseline!" %\
+                        e.args[0])
+                return -1
+
+        for series in chart["series"]:
+            try:
+                report.add_series(None, series["name"],
+                                        series["metric"],
+                                        series["tags"])
+            except KeyError as e:
+                print("Parameter '%s' is required for a series!" %\
+                        e.args[0])
+                return -1
+        return 0
+
+    def _do_create(self, argv):
+        charts = []
+        i = 1
+        series = None
+        baseline = None
+
+        report = PerfRepo.PerfRepoReport()
+        report.set_type("Metric")
+
+        try:
+            while i < len(argv):
+                if argv[i] == "name":
+                    if report.get_name() is None:
+                        report.set_name(argv[i+1])
+                        i += 2
+                        continue
+                    else:
+                        print("Report name already specified!",
+                              file=sys.stderr)
+                        return -1
+                elif argv[i] == "type":
+                    report.set_type(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "chart":
+                    chart, new_i = self._parse_chart_add(argv[i+1:])
+                    charts.append(chart)
+                    i += 1 + new_i
+                    continue
+                else:
+                    print("Parameter '%s' not defined/implemented!" %\
+                            argv[i], file=sys.stderr)
+                    return -1
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return -1
+
+        if report.get_name() is None:
+            print("Report name not specified!", file=sys.stderr)
+            return -1
+
+        for chart in charts:
+            self._report_add_chart(report, chart)
+
+        report = self._perf_api.report_create(report)
+        print("Created report with url: %s" %
self._perf_api.get_obj_url(report))
+        return 0
+
+    def _do_update(self, argv):
+        report_id = None
+        try:
+            if argv[1] != "id":
+                print("Parameter 'id' is required!", file=sys.stderr)
+                return -1
+            report_id = str(int(argv[2]))
+        except IndexError:
+            print("Parameter 'id' is required!", file=sys.stderr)
+            return -1
+        except ValueError:
+            print("Value of parameter 'id' must be a number!",
file=sys.stderr)
+            return -1
+
+        report = self._perf_api.report_get_by_id(report_id)
+        if report is None:
+            print("Invalid ID specified!", file=sys.stderr)
+            return -1
+
+        i = 3
+        while i < len(argv):
+            if argv[i] == "name":
+                report.set_name(argv[i+1])
+                i += 2
+                continue
+
+            op = "edit"
+            if argv[i] in ["add", "del", "edit"]:
+                op = argv[i]
+                i += 1
+            if argv[i] == "chart":
+                if op == "add":
+                    chart, new_i = self._parse_chart_add(argv[i+1:])
+                    i += 1 + new_i
+
+                    self._report_add_chart(report, chart)
+                elif op == "edit":
+                    chart_num = int(argv[i+1])
+                    i += 2
+                    while i < len(argv):
+                        if argv[i] == "name":
+                            report.set_chart_name(chart_num, argv[i+1])
+                            i += 2
+                            continue
+                        elif argv[i] == "testid":
+                            report.set_chart_test_id(chart_num, argv[i+1])
+                            i += 2
+                            continue
+                        elif argv[i] == "testuid":
+                            test = self._perf_api.test_get_by_uid(argv[i+1])
+                            report.set_chart_test_id(chart_num, test.get_id())
+                            i += 2
+                            continue
+
+                        op2 = "edit"
+                        if argv[i] in ["add", "del",
"edit"]:
+                            op = argv[i]
+                            i += 1
+
+                        if argv[i] == "series":
+                            if op == "add":
+                                series, new_i = self._parse_series(argv[i+1:])
+                                i += 1 + new_i
+                                try:
+                                    report.add_series(chart_num,
+                                                      series["name"],
+                                                      series["metric"],
+                                                      series["tags"])
+                                except KeyError as e:
+                                    print("Parameter '%s' is required for a
series!"\
+                                          % e.args[0])
+                                    return -1
+                            elif op == "edit":
+                                series_num = int(argv[i+1])
+                                i += 2
+                                while i < len(argv):
+                                    if argv[i] == "name":
+                                        report.set_series_name(chart_num,
+                                                               series_num,
+                                                               argv[i+1])
+                                        i += 2
+                                        continue
+                                    elif argv[i] == "metric":
+                                        report.set_series_metric(chart_num,
+                                                                 series_num,
+                                                                 argv[i+1])
+                                        i += 2
+                                        continue
+                                    elif argv[i] == "+tags":
+                                        tags = argv[i+1].split(',')
+                                        report.add_series_tags(chart_num,
+                                                               series_num,
+                                                               tags)
+                                        i += 2
+                                        continue
+                                    elif argv[i] == "-tags":
+                                        tags = argv[i+1].split(',')
+                                        report.remove_series_tags(chart_num,
+                                                                  series_num,
+                                                                  tags)
+                                        i += 2
+                                        continue
+                                    else:
+                                        break
+                            elif op == "del":
+                                series_num = argv[i+1]
+                                report.del_series(chart_num, series_num)
+                                i += 2
+                                continue
+                        elif argv[i] == "baseline":
+                            if op == "add":
+                                baseline, new_i = self._parse_baseline(argv[i+1:])
+                                i += 1 + new_i
+
+                                try:
+                                    report.add_baseline(None,
baseline["name"],
+                                                             
baseline["metric"],
+                                                             
baseline["execid"])
+                                except KeyError as e:
+                                    print("Parameter '%s' is required for a
baseline!"\
+                                          % e.args[0])
+                                    return -1
+                            elif op == "edit":
+                                baseline_num = argv[i+1]
+                                i += 2
+                                while i < len(argv):
+                                    if argv[i] == "name":
+                                        report.set_baseline_name(chart_num,
+                                                                 baseline_num,
+                                                                 argv[i+1])
+                                        i += 2
+                                        continue
+                                    elif argv[i] == "metric":
+                                        report.set_baseline_metric(chart_num,
+                                                                   baseline_num,
+                                                                   argv[i+1])
+                                        i += 2
+                                        continue
+                                    elif argv[i] == "execid":
+                                        report.set_baseline_execid(chart_num,
+                                                                   baseline_num,
+                                                                   argv[i+1])
+                                        i += 2
+                                        continue
+                                    else:
+                                        break
+                            elif op == "del":
+                                baseline_num = argv[i+1]
+                                report.del_baseline(chart_num, baseline_num)
+                                i += 2
+                                continue
+                        else:
+                            break
+
+                elif op == "del":
+                    chart_num = int(argv[i+1])
+                    report.del_chart(chart_num)
+                    i += 2
+                    continue
+            else:
+                print("Unknown parameter '%s'!" % argv[i])
+                return -1
+        self._perf_api.report_update(report)
+        return 0
+
+    def run(self):
+        argv = self._argv
+        if len(argv) == 0:
+            return -1
+        elif argv[0] == "help":
+            self.print_help()
+            return 0
+        elif argv[0] in ["get", "show"]:
+            try:
+                report_id = int(argv[1])
+                report = self._perf_api.report_get_by_id(report_id)
+                print(report)
+            except IndexError:
+                print("No ID specified!", file=sys.stderr)
+                return -1
+            except ValueError:
+                print("ID needs to be an integer!", file=sys.stderr)
+                return -1
+        elif argv[0] in ["create"]:
+            return self._do_create(argv)
+        elif argv[0] in ["update"]:
+            return self._do_update(argv)
+        else:
+            print("Command '%s' not implemented for Reports." %
argv[0], file=sys.stderr)
+            return -1
+        return 0
+
+def main():
+    """
+    Main function
+    """
+    cli_classes = {"report": ReportCLI,
+                   "testexec": TestExecCLI,
+                   "test": TestCLI}
+    obj = None
+    conf_file = None
+    url = None
+    username = None
+    password = None
+
+    i = 1
+    while obj is None and i < len(sys.argv):
+        if sys.argv[i] in cli_classes:
+            obj = sys.argv[i]
+            i += 1
+        elif sys.argv[i] in ["-u", "--url"]:
+            url = sys.argv[i+1]
+            i += 2
+        elif sys.argv[i] in ["-n", "--username"]:
+            username = sys.argv[i+1]
+            i += 2
+        elif sys.argv[i] in ["-p", "--password"]:
+            password = sys.argv[i+1]
+            i += 2
+        elif sys.argv[i] in ["-c", "--config"]:
+            conf_file = sys.argv[i+1]
+            i += 2
+        else:
+            usage(-1)
+
+    if obj is None:
+        usage(-1)
+    else:
+        lnst_config.controller_init()
+        dirname = os.path.dirname(sys.argv[0])
+        gitcfg = os.path.join(dirname, "lnst-ctl.conf")
+        if os.path.isfile(gitcfg):
+            lnst_config.load_config(gitcfg)
+        else:
+            lnst_config.load_config('/etc/lnst-ctl.conf')
+
+        usr_cfg = os.path.expanduser('~/.lnst/lnst-ctl.conf')
+        if os.path.isfile(usr_cfg):
+            lnst_config.load_config(usr_cfg)
+
+        if conf_file is not None:
+            lnst_config.load_config(conf_file)
+
+        cli = cli_classes[obj](url, username, password, sys.argv[i:])
+        ret_val = cli.run()
+
+        if ret_val < 0:
+            cli.print_help()
+        return ret_val
+
+    return 0
+
+if __name__ == "__main__":
+    sys.exit(main())
-- 
2.5.2

[PATCH 18/19] perfrepo-cli: add report deletion and get for Test and TestExecs

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This patch implements report delete functionality and get/show
functionality for Test and TestExecution objects.

For test get, we try both by_id and by_uid options.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 perfrepo | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 2 deletions(-)

diff --git a/perfrepo b/perfrepo
index cda306c..8f6349b 100755
--- a/perfrepo
+++ b/perfrepo
@@ -66,10 +66,78 @@ class GenericCLI(object):
         return -1
 
 class TestCLI(GenericCLI):
-    pass
+    def print_help(self):
+        """
+        Print usage for the report object
+        """
+        print("Usage: %s test help" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s test get {ID | UID}" % sys.argv[0], file=sys.stderr)
+        print("       %s test show {ID | UID}" % sys.argv[0], file=sys.stderr)
+
+    def run(self):
+        argv = self._argv
+        if len(argv) == 0:
+            return -1
+        elif argv[0] == "help":
+            self.print_help()
+            return 0
+        elif argv[0] in ["get", "show"]:
+            try:
+                test_id = int(argv[1])
+                test = self._perf_api.test_get_by_id(test_id)
+                if test is None:
+                    test = self._perf_api.test_get_by_uid(test_id)
+                if test is None:
+                    print("Test not found.")
+                else:
+                    print(test)
+            except IndexError:
+                print("No ID specified!", file=sys.stderr)
+                return -1
+            except ValueError:
+                print("ID needs to be an integer!", file=sys.stderr)
+                return -1
+        else:
+            print("Command '%s' not implemented for Tests." % argv[0],
file=sys.stderr)
+            return -1
+        return 0
 
 class TestExecCLI(GenericCLI):
-    pass
+    def print_help(self):
+        """
+        Print usage for the report object
+        """
+        print("Usage: %s texec help" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s texec get ID" % sys.argv[0], file=sys.stderr)
+        print("       %s texec show ID" % sys.argv[0], file=sys.stderr)
+
+    def run(self):
+        argv = self._argv
+        if len(argv) == 0:
+            return -1
+        elif argv[0] == "help":
+            self.print_help()
+            return 0
+        elif argv[0] in ["get", "show"]:
+            try:
+                exec_id = int(argv[1])
+                texec = self._perf_api.testExecution_get(exec_id)
+                if texec is None:
+                    print("TestExecution not found.")
+                else:
+                    print(texec)
+            except IndexError:
+                print("No ID specified!", file=sys.stderr)
+                return -1
+            except ValueError:
+                print("ID needs to be an integer!", file=sys.stderr)
+                return -1
+        else:
+            print("Command '%s' not implemented for TestExecutions." %
argv[0], file=sys.stderr)
+            return -1
+        return 0
 
 class ReportCLI(GenericCLI):
     def print_help(self):
@@ -110,6 +178,8 @@ class ReportCLI(GenericCLI):
         print("                     edit is implicit - noOP == 'edit'",
file=sys.stderr)
         print("                     OPs 'edit' and 'del' require
NUM, whereas 'add' requires NAME", file=sys.stderr)
         print("                     if chart OP == 'add' then all further
OPs are 'add' as in the 'report create' command", file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s report delete ID" % sys.argv[0], file=sys.stderr)
 
     def _parse_baseline(self, argv):
         baseline = {}
@@ -450,6 +520,20 @@ class ReportCLI(GenericCLI):
             return self._do_create(argv)
         elif argv[0] in ["update"]:
             return self._do_update(argv)
+        elif argv[0] in ["delete"]:
+            try:
+                report_id = int(argv[1])
+                result = self._perf_api.report_delete_by_id(report_id)
+                if result:
+                    print("Report deleted.")
+                else:
+                    print("Report delete failed.")
+            except IndexError:
+                print("No ID specified!", file=sys.stderr)
+                return -1
+            except ValueError:
+                print("ID needs to be an integer!", file=sys.stderr)
+                return -1
         else:
             print("Command '%s' not implemented for Reports." %
argv[0], file=sys.stderr)
             return -1
-- 
2.5.2

[PATCH 19/19] perfrepo-cli: add create and delete for Tests and TestExecutions

[Ondrej Lichtner]

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

This patch adds the implementation for creating and deleting Test and
TestExecution objects. For now this should be everything that we need
from the CLI application.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 perfrepo | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 173 insertions(+), 3 deletions(-)

diff --git a/perfrepo b/perfrepo
index 8f6349b..aef105c 100755
--- a/perfrepo
+++ b/perfrepo
@@ -74,6 +74,74 @@ class TestCLI(GenericCLI):
         print("", file=sys.stderr)
         print("       %s test get {ID | UID}" % sys.argv[0], file=sys.stderr)
         print("       %s test show {ID | UID}" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s test create" % sys.argv[0], file=sys.stderr)
+        print("                     name NAME", file=sys.stderr)
+        print("                     uid UID", file=sys.stderr)
+        print("                     groupid GID", file=sys.stderr)
+        print("                     [description DESCRIPTION]",
file=sys.stderr)
+        print("                     [metric ID ...]", file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s test delete ID" % sys.argv[0], file=sys.stderr)
+
+    def _do_create(self, argv):
+        test = PerfRepo.PerfRepoTest()
+        i = 0
+        try:
+            while i < len(argv):
+                if argv[i] == "name":
+                    test.set_name(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "uid":
+                    test.set_uid(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "groupid":
+                    test.set_groupid(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "description":
+                    test.set_description(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "metric":
+                    metric = PerfRepo.PerfRepoMetric()
+                    metric.set_id(argv[i+1])
+                    test.add_metric(metric)
+                    i += 2
+                    continue
+                else:
+                    print("Argument '%s' not supported for test
create!" % argv[i])
+                    return -1
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return -1
+
+        if test.get_name() is None:
+            print("Name not specified!")
+            return -1
+        elif test.get_uid() is None:
+            print("UID not specified!")
+            return -1
+        elif test.get_groupid() is None:
+            print("GID not specified!")
+            return -1
+
+        test = self._perf_api.test_create(test)
+        print("Created test with url: %s" % self._perf_api.get_obj_url(test))
+        return 0
+
+    def _do_delete(self, argv):
+        if len(argv) < 1:
+            print("Test delete requires an ID!")
+            return -1
+        if self._perf_api.test_delete(argv[0]):
+            print("Test deleted")
+        else:
+            print("Test not found")
+            return -1
+        return 0
 
     def run(self):
         argv = self._argv
@@ -98,6 +166,10 @@ class TestCLI(GenericCLI):
             except ValueError:
                 print("ID needs to be an integer!", file=sys.stderr)
                 return -1
+        elif argv[0] == "create":
+            self._do_create(argv[1:])
+        elif argv[0] == "delete":
+            self._do_delete(argv[1:])
         else:
             print("Command '%s' not implemented for Tests." % argv[0],
file=sys.stderr)
             return -1
@@ -108,10 +180,102 @@ class TestExecCLI(GenericCLI):
         """
         Print usage for the report object
         """
-        print("Usage: %s texec help" % sys.argv[0], file=sys.stderr)
+        print("Usage: %s testexec help" % sys.argv[0], file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s testexec get ID" % sys.argv[0], file=sys.stderr)
+        print("       %s testexec show ID" % sys.argv[0], file=sys.stderr)
         print("", file=sys.stderr)
-        print("       %s texec get ID" % sys.argv[0], file=sys.stderr)
-        print("       %s texec show ID" % sys.argv[0], file=sys.stderr)
+        print("       %s testexec create" % sys.argv[0], file=sys.stderr)
+        print("                     name NAME", file=sys.stderr)
+        print("                     {testid ID | testuid UID}",
file=sys.stderr)
+        print("                     [comment COMMENT]", file=sys.stderr)
+        print("                     value NAME=VAL [value NAME=value ...]",
file=sys.stderr)
+        print("                     tags TAG,[TAG,...]", file=sys.stderr)
+        print("                     [param NAME=VAL ...]", file=sys.stderr)
+        print("", file=sys.stderr)
+        print("       %s testexec delete ID" % sys.argv[0], file=sys.stderr)
+
+    def _do_create(self, argv):
+        texec = PerfRepo.PerfRepoTestExecution()
+        i = 0
+        try:
+            while i < len(argv):
+                if argv[i] == "name":
+                    texec.set_name(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "testid":
+                    texec.set_testId(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "testuid":
+                    texec.set_testUid(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "comment":
+                    texec.set_comment(argv[i+1])
+                    i += 2
+                    continue
+                elif argv[i] == "tags":
+                    tags = argv[i+1].split(",")
+                    for tag in tags:
+                        texec.add_tag(tag)
+                    i += 2
+                    continue
+                elif argv[i] == "param":
+                    param = argv[i+1].split("=")
+                    try:
+                        param_name = param[0]
+                        param_val = param[1]
+                    except:
+                        print("Invalid param '%s'" % argv[i+1])
+
+                    texec.add_parameter(param_name, param_val)
+                    i += 2
+                elif argv[i] == "value":
+                    value = argv[i+1].split("=")
+                    try:
+                        value_name = value[0]
+                        value_val = float(value[1])
+                    except:
+                        print("Invalid value '%s'" % argv[i+1])
+
+                    value = PerfRepo.PerfRepoValue()
+                    value.set_metricName(value_name)
+                    value.set_result(value_val)
+
+                    texec.add_value(value)
+                    i += 2
+                    continue
+                    continue
+                else:
+                    print("Argument '%s' not supported for test
create!" % argv[i])
+                    return -1
+        except IndexError:
+            print("Parameter '%s' requires a value!" % argv[i])
+            return -1
+
+        if texec.get_name() is None:
+            print("Name not specified!")
+            return -1
+        elif texec.get_testUid() is None and texec.get_testId() is None:
+            print("Test ID/UID not specified!")
+            return -1
+
+        texec = self._perf_api.testExecution_create(texec)
+        print("Created TestExecution with url: %s" %
self._perf_api.get_obj_url(texec))
+        return 0
+
+    def _do_delete(self, argv):
+        if len(argv) < 1:
+            print("TestExecution delete requires an ID!")
+            return -1
+        if self._perf_api.testExecution_delete(argv[0]):
+            print("TestExecution removed")
+        else:
+            print("TestExecution not found")
+            return -1
+        return 0
 
     def run(self):
         argv = self._argv
@@ -134,6 +298,12 @@ class TestExecCLI(GenericCLI):
             except ValueError:
                 print("ID needs to be an integer!", file=sys.stderr)
                 return -1
+        elif argv[0] == "create":
+            self._do_create(argv[1:])
+            return 0
+        elif argv[0] == "delete":
+            self._do_delete(argv[1:])
+            return 0
         else:
             print("Command '%s' not implemented for TestExecutions." %
argv[0], file=sys.stderr)
             return -1
-- 
2.5.2

[Jiri Prochazka]

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  People from different time zones can use the same PerfRepo instance,
>  automatically using UTC time stamps will avoid incorrect sorting of
>  results (by date).
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/PerfRepo.py | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
>  diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  index e244321..4418902 100644
>  --- a/lnst/Controller/PerfRepo.py
>  +++ b/lnst/Controller/PerfRepo.py
>  @@ -121,7 +121,7 @@ class PerfRepoTestExecution(PerfRepoObject):
>           if type(xml) is NoneType:
>               self._id = None
>               self._name = None
>  -            self._started = datetime.datetime.now().isoformat()
>  +            self._started = datetime.datetime.utcnow().isoformat()
>               self._testId = None
>               self._testUid = None
>               self._comment = ""
>  @@ -173,7 +173,7 @@ class PerfRepoTestExecution(PerfRepoObject):
>
>       def set_started(self, date=None):
>           if isinstance(date, NoneType):
>  -            date = datetime.datetime.now()
>  +            date = datetime.datetime.utcnow().isoformat()
>               self._started = date.isoformat()
>  
​isoformat() returns type str, so execution fails on AttributeError
exception​
​Either don't call isoformat() on line with utcnow() or on the line below​



>           else:
>               self._started = date
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[Jan Tluka]

Mon, Sep 14, 2015 at 08:26:40AM EDT, jprochaz(a)redhat.com wrote:
> 2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:
>
> > From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> >
> > People from different time zones can use the same PerfRepo instance,
> > automatically using UTC time stamps will avoid incorrect sorting of
> > results (by date).
> >
> > Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> > ---
> >  lnst/Controller/PerfRepo.py | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
> > index e244321..4418902 100644
> > --- a/lnst/Controller/PerfRepo.py
> > +++ b/lnst/Controller/PerfRepo.py
> > @@ -121,7 +121,7 @@ class PerfRepoTestExecution(PerfRepoObject):
> >          if type(xml) is NoneType:
> >              self._id = None
> >              self._name = None
> > -            self._started = datetime.datetime.now().isoformat()
> > +            self._started = datetime.datetime.utcnow().isoformat()
> >              self._testId = None
> >              self._testUid = None
> >              self._comment = ""
> > @@ -173,7 +173,7 @@ class PerfRepoTestExecution(PerfRepoObject):
> >
> >      def set_started(self, date=None):
> >          if isinstance(date, NoneType):
> > -            date = datetime.datetime.now()
> > +            date = datetime.datetime.utcnow().isoformat()
> >              self._started = date.isoformat()
> >
>
> ​isoformat() returns type str, so execution fails on AttributeError
> exception​
> ​Either don't call isoformat() on line with utcnow() or on the line below​
>
>
>  
Hmm, I don't see that problem on my setup. With which python version do
you see that?

Python 2.7.8 (default, Jul  5 2015, 14:16:16) 
[GCC 4.9.2 20150212 (Red Hat 4.9.2-6)] on linux2
Type "help", "copyright", "credits" or "license"
for more information.
> >> import datetime
> >> a = datetime.datetime.now().isoformat()
> >> b = datetime.datetime.utcnow().isoformat()
> >> a 
'2015-09-14T22:06:13.488851'
> >> b 
'2015-09-15T02:06:20.313035'

> >          else:
> >              self._started = date
> > --
> > 2.5.2
> >
> > _______________________________________________
> > LNST-developers mailing list
> > LNST-developers(a)lists.fedorahosted.org
> > https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
> >
>
>
>
> -- 
> ​Best regards,​
>
> Jiri Prochazka
> LNST Developer
> ​| www.lnst-project.org​
>
> [phone] | jprochaz(a)redhat.com
> Red Hat Czech | Purkyňova 71/99, 612 00 Brno 
> _______________________________________________
> LNST-developers mailing list
> LNST-developers(a)lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers

[Jiri Prochazka]

2015-09-15 4:10 GMT+02:00 Jan Tluka <jtluka(a)redhat.com&gt;:

>  Mon, Sep 14, 2015 at 08:26:40AM EDT, jprochaz(a)redhat.com wrote:
>  >2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:
>  >
>  >> From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  >>
>  >> People from different time zones can use the same PerfRepo instance,
>  >> automatically using UTC time stamps will avoid incorrect sorting of
>  >> results (by date).
>  >>
>  >> Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  >> ---
>  >>  lnst/Controller/PerfRepo.py | 4 ++--
>  >>  1 file changed, 2 insertions(+), 2 deletions(-)
>  >>
>  >> diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  >> index e244321..4418902 100644
>  >> --- a/lnst/Controller/PerfRepo.py
>  >> +++ b/lnst/Controller/PerfRepo.py
>  >> @@ -121,7 +121,7 @@ class PerfRepoTestExecution(PerfRepoObject):
>  >>          if type(xml) is NoneType:
>  >>              self._id = None
>  >>              self._name = None
>  >> -            self._started = datetime.datetime.now().isoformat()
>  >> +            self._started = datetime.datetime.utcnow().isoformat()
>  >>              self._testId = None
>  >>              self._testUid = None
>  >>              self._comment = ""
>  >> @@ -173,7 +173,7 @@ class PerfRepoTestExecution(PerfRepoObject):
>  >>
>  >>      def set_started(self, date=None):
>  >>          if isinstance(date, NoneType):
>  >> -            date = datetime.datetime.now()
>  >> +            date = datetime.datetime.utcnow().isoformat()
>  >>              self._started = date.isoformat()
>  >>
>  >
>  >​isoformat() returns type str, so execution fails on AttributeError
>  >exception​
>  >​Either don't call isoformat() on line with utcnow() or on the line below​
>  >
>  >
>  >
>
>  Hmm, I don't see that problem on my setup. With which python version do
>  you see that?
>
>  Python 2.7.8 (default, Jul  5 2015, 14:16:16)
>  [GCC 4.9.2 20150212 (Red Hat 4.9.2-6)] on linux2
>  Type "help", "copyright", "credits" or "license"
> for more information.
>  >>> import datetime
>  >>> a = datetime.datetime.now().isoformat()
>  >>> b = datetime.datetime.utcnow().isoformat()
>  >>> a
>  '2015-09-14T22:06:13.488851'
>  >>> b
>  '2015-09-15T02:06:20.313035'
>
>  
​The problem is not with utcnow() but with isoformat() called twice, second
time on str object, see this:
Python 2.7.10 (default, Jul  5 2015, 14:15:43)
[GCC 5.1.1 20150618 (Red Hat 5.1.1-4)] on linux2
Type "help", "copyright", "credits" or "license"
for more information.
> >> import datetime
> >> date = datetime.datetime.utcnow().isoformat()
> >> started = date.isoformat() 
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
AttributeError: 'str' object has no attribute 'isoformat'
​

>  >>          else:
>  >>              self._started = date
>  >> --
>  >> 2.5.2
>  >>
>  >> _______________________________________________
>  >> LNST-developers mailing list
>  >> LNST-developers(a)lists.fedorahosted.org
>  >> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  >>
>  >
>  >
>  >
>  >--
>  >​Best regards,​
>  >
>  >Jiri Prochazka
>  >LNST Developer
>  >​| www.lnst-project.org​
>  >
>  >[phone] | jprochaz(a)redhat.com
>  >Red Hat Czech | Purkyňova 71/99, 612 00 Brno
>
>  >_______________________________________________
>  >LNST-developers mailing list
>  &gt;LNST-developers(a)lists.fedorahosted.org
>  >https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>
>  

-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 05/19] PerfRepo: add to_xml method to PerfRepoReport class

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  Needed for POST requests to PerfRepo, such as create or update.
>
>  Also adding the __str__ method that uses pprint to display the object in
>  a nice not-XML fashion.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/PerfRepo.py | 38 +++++++++++++++++++++++++++++++++++++-
>   1 file changed, 37 insertions(+), 1 deletion(-)
>
>  diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  index 6da8190..f409b04 100644
>  --- a/lnst/Controller/PerfRepo.py
>  +++ b/lnst/Controller/PerfRepo.py
>  @@ -15,11 +15,13 @@ import datetime
>   import re
>   import logging
>   import xml.dom.minidom
>  +import textwrap
>  +import pprint
>   from types import StringType, NoneType
>   from xml.etree import ElementTree
>   from xml.etree.ElementTree import Element
>   from lnst.Common.Utils import recursive_dict_update
>  -from lnst.Common.Utils import dot_to_dict
>  +from lnst.Common.Utils import dot_to_dict, dict_to_dot
>
>   class PerfRepoException(Exception):
>       pass
>  @@ -437,6 +439,40 @@ class PerfRepoReport(PerfRepoObject):
>       def get_obj_url(self):
>           return "/reports/%s/%s" % (self._type.lower(), self._id)
>
>  +    def to_xml(self):
>  +        root = Element('report')
>  +        self._set_element_atrib(root, 'id', self._id)
>  +        self._set_element_atrib(root, 'name', self._name)
>  +        self._set_element_atrib(root, 'type', self._type)
>  +        self._set_element_atrib(root, 'user', self._user)
>  
​​Here you use apostrophes​​

+
>  +        properties = ElementTree.SubElement(root,
> 'properties') 
+        dot_props = dict_to_dot(self._properties)
>  +        for prop in dot_props:
>  +            entry_elem = ElementTree.SubElement(properties, 'entry')
>  +            key_elem = ElementTree.SubElement(entry_elem, 'key')
>  +            value_elem = ElementTree.SubElement(entry_elem, 'value')
>  +
>  +            key_elem.text = prop[0]
>  +            self._set_element_atrib(value_elem, "name", prop[0])
>  
​Here you use quotes​
It would look better if this was consistent​



>  +            self._set_element_atrib(value_elem, "value",
> prop[1])
>  +
>  +        return root
>  +
>  +    def __str__(self):
>  +        str_props = pprint.pformat(self._properties)
>  +        ret_str = """\
>  +                  id = %s
>  +                  name = %s
>  +                  type = %s
>  +                  properties =
>  +                  """ % ( self._id,
>  +                          self._name,
>  +                          self._type)
>  +        ret_str = textwrap.dedent(ret_str)
>  +        ret_str += str_props
>  +        return textwrap.dedent(ret_str)
>  +
>   class PerfRepoRESTAPI(object):
>       '''Wrapper class for the REST API provided by PerfRepo'''
>       def __init__(self, url, user, password):
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 10/19] Utils: add indent function

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  Very simple implementation of adding space indentation to multiline
>  strings. Will be used when pretty printing PerfRepo objects.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Common/Utils.py | 6 ++++++
>   1 file changed, 6 insertions(+)
>
>  diff --git a/lnst/Common/Utils.py b/lnst/Common/Utils.py
>  index 22d2925..ceb01a3 100644
>  --- a/lnst/Common/Utils.py
>  +++ b/lnst/Common/Utils.py
>  @@ -290,3 +290,9 @@ def is_installed(program):
>           return True
>       except subprocess.CalledProcessError:
>           return False
>  +
>  +def indent(string, spaces):
>  +    ret_str = ""
>  +    for line in string.split("\n"):
>  +        ret_str += " "*spaces + line + "\n"
>  
​is it okay that you add newline on the last line too, where it may not be?​


>  +    return ret_str
>  
​maybe changing this to return ret_str.rstrip("\n")​ would be better



>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 13/19] PerfRepo: implement report_delete_by_id method

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  Renamed from report_delete. The method is now tested and usable.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/PerfRepo.py | 13 ++++++++-----
>   1 file changed, 8 insertions(+), 5 deletions(-)
>
>  diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  index ba3fd64..3aca991 100644
>  --- a/lnst/Controller/PerfRepo.py
>  +++ b/lnst/Controller/PerfRepo.py
>  @@ -966,8 +966,11 @@ class PerfRepoRESTAPI(object):
>               logging.info("Obj url: %s" % self.get_obj_url(report))
>               return report
>
>  -    def report_delete(self, report_id):
>  -        #TODO not needed yet and therefore not tested
>  -        delete_url = self._url + '/rest/report/delete'
>  -        self._session.delete(post_url)
>  -        return None
>  +    def report_delete_by_id(self, report_id):
>  +        delete_url = self._url + '/rest/report/id/%s' % report_id
>  +        response = self._session.delete(delete_url)
>  +        if response.status_code != 204:
>  
​Maybe these status codes could be stored in named constants,
so it's more readable?


>  +            return False
>  +        else:
>  +            logging.info("DELETE %s success" % delete_url)
>  +            return True
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 14/19] PerfRepo: add missing get methods

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  Some PerfRepo objects were missing a few get methods for their
>  attributes. This patch fixes that.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/PerfRepo.py | 25 +++++++++++++++++++++++++
>   1 file changed, 25 insertions(+)
>
>  diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  index 3aca991..f7949d0 100644
>  --- a/lnst/Controller/PerfRepo.py
>  +++ b/lnst/Controller/PerfRepo.py
>  @@ -118,6 +118,13 @@ class PerfRepoTest(PerfRepoObject):
>       def set_groupid(self, groupid):
>           self._groupid = groupid
>
>  +    def add_metric(self, metric):
>  +        if not isinstance(metric, PerfRepoMetric):
>  +            return None
>  +        else:
>  +            self._metrics.append(metric)
>  +            return metric
>  +
>  
​this is not get method and should be added in separate patch​



>       def to_xml(self):
>           root = Element('test')
>           self._set_element_atrib(root, 'id', self._id)
>  @@ -206,9 +213,15 @@ class PerfRepoTestExecution(PerfRepoObject):
>       def set_id(self, id):
>           self._id = id
>
>  +    def get_id(self):
>  +        return self._id
>  +
>       def set_name(self, name):
>           self._name = name
>
>  +    def get_name(self):
>  +        return self._name
>  +
>       def set_started(self, date=None):
>           if isinstance(date, NoneType):
>               date = datetime.datetime.utcnow().isoformat()
>  @@ -216,12 +229,18 @@ class PerfRepoTestExecution(PerfRepoObject):
>           else:
>               self._started = date
>
>  +    def get_started(self):
>  +        return self._started
>  +
>       def set_testId(self, testId):
>           if isinstance(testId, PerfRepoTest):
>               self._testId = testId.get_id()
>           else:
>               self._testId = testId
>
>  +    def get_testId(self):
>  +        return self._testId
>  +
>       def set_testUid(self, testUid):
>           if isinstance(testUid, PerfRepoTest):
>               self._testUid = testUid.get_uid()
>  @@ -234,6 +253,9 @@ class PerfRepoTestExecution(PerfRepoObject):
>       def set_comment(self, comment):
>           self._comment = comment
>
>  +    def get_comment(self):
>  +        return self._comment
>  +
>       def add_value(self, value):
>           self._values.append(value)
>
>  @@ -352,6 +374,9 @@ class PerfRepoValue(PerfRepoObject):
>       def add_parameter(self, name, value):
>           self._parameters.append((name, value))
>
>  +    def get_parameters(self):
>  +        return self._parameters
>  +
>       def get_metricName(self):
>           return self._metricName
>
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 15/19] PerfRepo: fix get_obj_url method

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  The method would crash if obj was not an object descended from the
>  PerfRepoObject class. This patch fixes the problem by checking the type
>  of the object.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   lnst/Controller/PerfRepo.py | 2 ++
>   1 file changed, 2 insertions(+)
>
>  diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
>  index f7949d0..dac186d 100644
>  --- a/lnst/Controller/PerfRepo.py
>  +++ b/lnst/Controller/PerfRepo.py
>  @@ -834,6 +834,8 @@ class PerfRepoRESTAPI(object):
>           self._session.headers['Content-Type'] = 'text/xml'
>
>       def get_obj_url(self, obj):
>  +        if not isinstance(obj, PerfRepoObject):
>  +            return ""
>  
​this could be merged with
​commit af41e0c085129d9f1f94d61dd3c84efcb7d6d64f, through interactive rebase



>           return self._url + obj.get_obj_url()
>
>       def test_get_by_id(self, test_id):
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 17/19] add perfrepo: CLI application for PerfRepo access

[Jiri Prochazka]

comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  This is a new application that gives us control over PerfRepo from the
>  command line. At the moment it is capable of getting, creating and
>  updating Report objects. More features will come soon.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   perfrepo | 519
>  +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 519 insertions(+)
>   create mode 100755 perfrepo
>
>  diff --git a/perfrepo b/perfrepo
>  new file mode 100755
>  index 0000000..cda306c
>  --- /dev/null
>  +++ b/perfrepo
>  @@ -0,0 +1,519 @@
>  +#! /usr/bin/env python2
>  +"""
>  +
>  +Copyright 2015 Red Hat, Inc.
>  +Licensed under the GNU General Public License, version 2 as
>  +published by the Free Software Foundation; see COPYING for details.
>  +"""
>  +
>  +from __future__ import print_function
>  +
>  +__author__ = """
>  +olichtne(a)redhat.com (Ondrej Lichtner)
>  +"""
>  +
>  +import sys
>  +import logging
>  +import os
>  +import re
>  +import datetime
>  +import lnst.Controller.PerfRepo as PerfRepo
>  +from lnst.Controller.PerfRepo import PerfRepoRESTAPI
>  +from lnst.Common.Config import lnst_config
>  +
>  +def usage(retval=0):
>  +    """
>  +    Print usage of this app
>  +    """
>  +    print("Usage: %s [OPTIONS...] OBJECT {COMMAND | help} [COMMAND_OPTS]"
>  % sys.argv[0], file=sys.stderr)
>  +    print("", file=sys.stderr)
>  +    print("OBJECT := { report | testexec | test }", file=sys.stderr)
>  +    print("OPTIONS := { -u URL | --url URL |", file=sys.stderr)
>  +    print("             -n USERNAME | --username USERNAME |",
>  file=sys.stderr)
>  +    print("             -p PASSWORD | --password PASSWORD |",
>  file=sys.stderr)
>  +    print("             -c FILE | --config FILE}", file=sys.stderr)
>  +    sys.exit(retval)
>  
​None of our help() methods is written to stderr, in order to be
consistent, we should
either print all help()/usage() to stderr or change this to print on stdout​


>  +
>  +
>  +class GenericCLI(object):
>  +    def __init__(self, url, username, password, argv):
>  +        if url is not None:
>  +            self._url = url
>  +        else:
>  +            self._url = lnst_config.get_option("perfrepo", "url")
>  +
>  +        if username is not None:
>  +            self._username = username
>  +        else:
>  +            self._username = lnst_config.get_option("perfrepo",
>  "username")
>  +
>  +        if password is not None:
>  +            self._password = password
>  +        else:
>  +            self._password = lnst_config.get_option("perfrepo",
>  "password")
>  +
>  +        self._argv = argv
>  +        self._perf_api = PerfRepoRESTAPI(self._url,
>  +                                         self._username,
>  +                                         self._password)
>  +
>  +    def print_help(self):
>  +        pass
>  +
>  +    def run(self):
>  +        print("Not implemented yet!", file=sys.stderr)
>  +        self.print_help()
>  +        return -1 
+
>  +class TestCLI(GenericCLI):
>  +    pass
>  +
>  +class TestExecCLI(GenericCLI):
>  +    pass
>  +
>  +class ReportCLI(GenericCLI):
>  +    def print_help(self):
>  +        """
>  +        Print usage for the report object
>  +        """
>  +        print("Usage: %s report help" % sys.argv[0], file=sys.stderr)
>  +        print("", file=sys.stderr)
>  +        print("       %s report get ID" % sys.argv[0], file=sys.stderr)
>  +        print("       %s report show ID" % sys.argv[0], file=sys.stderr)
>  +        print("", file=sys.stderr)
>  +        print("       %s report create" % sys.argv[0], file=sys.stderr)
>  +        print("                     name NAME [type TYPE]",
>  file=sys.stderr)
>  +        print("                         chart NAME", file=sys.stderr)
>  +        print("                         {testid ID | testuid UID}",
>  file=sys.stderr)
>  +        print("                             series NAME", file=sys.stderr)
>  +        print("                                    metric ID",
>  file=sys.stderr)
>  +        print("                                    tags TAG[,TAG,...]",
>  file=sys.stderr)
>  +        print("                             baseline NAME",
>  file=sys.stderr)
>  +        print("                                    execid ID",
>  file=sys.stderr)
>  +        print("                                    metric ID",
>  file=sys.stderr)
>  +        print("       %s report update" % sys.argv[0], file=sys.stderr)
>  +        print("                     id ID", file=sys.stderr)
>  +        print("                         [name NAME]", file=sys.stderr)
>  +        print("                         OP chart [NUM | NAME]",
>  file=sys.stderr)
>  +        print("                         [testid ID | testuid UID]",
>  file=sys.stderr)
>  +        print("                             [name NAME]", file=sys.stderr)
>  +        print("                             [ OP series [NUM | NAME] ]",
>  file=sys.stderr)
>  +        print("                                    [name NAME]",
>  file=sys.stderr)
>  +        print("                                    [metric ID]",
>  file=sys.stderr)
>  +        print("                                    [+tags TAG[,TAG,...]
>  ]", file=sys.stderr)
>  +        print("                                    [-tags TAG[,TAG,...]
>  ]", file=sys.stderr)
>  +        print("                             [ OP baseline [ NUM | NAME]
>  ]", file=sys.stderr)
>  +        print("                                    [name NAME]",
>  file=sys.stderr)
>  +        print("                                    [execid ID]",
>  file=sys.stderr)
>  +        print("                                    [metric ID]",
>  file=sys.stderr)
>  +        print("                     WHERE OP is [add | del | edit]",
>  file=sys.stderr)
>  +        print("                     edit is implicit - noOP ==
> 'edit'",
>  file=sys.stderr)
>  +        print("                     OPs 'edit' and 'del' require
> NUM,
>  whereas 'add' requires NAME", file=sys.stderr)
>  +        print("                     if chart OP == 'add' then all further
>  OPs are 'add' as in the 'report create' command", file=sys.stderr)
>  
​same as above​


>  +
>  +    def _parse_baseline(self, argv):
>  +        baseline = {}
>  +        baseline["name"] = argv[0]
>  +
>  +        i = 1
>  +        try:
>  +            while i < len(argv):
>  +                if argv[i] == "execid":
>  +                    baseline["execid"] = argv[i+1]
>  +                    i += 2
>  +                    continue
>  +                elif argv[i] == "metric":
>  +                    baseline["metric"] = argv[i+1]
>  +                    i += 2
>  +                    continue
>  +                else:
>  +                    return (baseline, i)
>  +        except IndexError:
>  +            print("Parameter '%s' requires a value!" % argv[i])
>  +            return ({}, 0)
>  +        return (baseline, i)
>  +
>  +    def _parse_series(self, argv):
>  +        series = {"tags": []}
>  +        series["name"] = argv[0]
>  +
>  +        i = 1
>  +        try:
>  +            while i < len(argv):
>  +                if argv[i] == "tags":
>  +                    tags = argv[i+1].split(",")
>  +                    series["tags"] = tags
>  +                    i += 2
>  +                    continue
>  +                elif argv[i] == "metric":
>  +                    series["metric"] = argv[i+1]
>  +                    i += 2
>  +                    continue
>  +                else:
>  +                    return (series, i)
>  +        except IndexError:
>  +            print("Parameter '%s' requires a value!" % argv[i])
>  +            return ({}, 0)
>  +        return (series, i)
>  +
>  +    def _parse_chart_add(self, argv):
>  +        chart = {"series": [], "baselines": []}
>  +
>  +        baseline = None
>  +        series = None
>  +
>  +        chart["name"] = argv[0]
>  +        i = 1
>  +        try:
>  +            while i < len(argv):
>  +                if argv[i] == "testid":
>  +                    chart["test"] = argv[i+1]
>  +                    i += 2
>  +                    continue
>  +                elif argv[i] == "testuid":
>  +                    test = self._perf_api.test_get_by_uid(argv[i+1])
>  +                    chart["test"] = test.get_id()
>  +                    i += 2
>  +                    continue
>  +                elif argv[i] == "series":
>  +                    series, new_i = self._parse_series(argv[i+1:])
>  +                    chart["series"].append(series)
>  +                    i += 1 + new_i
>  +                elif argv[i] == "baseline":
>  +                    baseline, new_i = self._parse_baseline(argv[i+1:])
>  +                    chart["baselines"].append(baseline)
>  +                    i += 1 + new_i
>  +                    continue
>  +                else:
>  +                    return (chart, i)
>  +        except IndexError:
>  +            print("Parameter '%s' requires a value!" % argv[i])
>  +            return ({}, 0)
>  +        return (chart, i)
>  +
>  +    def _report_add_chart(self, report, chart):
>  +        report.add_chart(chart["name"], chart["test"])
>  +
>  +        for baseline in chart["baselines"]:
>  +            try:
>  +                report.add_baseline(None, baseline["name"],
>  +                                          baseline["metric"],
>  +                                          baseline["execid"])
>  +            except KeyError as e:
>  +                print("Parameter '%s' is required for a baseline!" %\
>  +                        e.args[0])
>  +                return -1
>  +
>  +        for series in chart["series"]:
>  +            try:
>  +                report.add_series(None, series["name"],
>  +                                        series["metric"],
>  +                                        series["tags"])
>  +            except KeyError as e:
>  +                print("Parameter '%s' is required for a series!" %\
>  +                        e.args[0])
>  +                return -1
>  +        return 0
>  +
>  +    def _do_create(self, argv):
>  +        charts = []
>  +        i = 1
>  +        series = None
>  +        baseline = None
>  +
>  +        report = PerfRepo.PerfRepoReport()
>  +        report.set_type("Metric")
>  +
>  +        try:
>  +            while i < len(argv):
>  +                if argv[i] == "name":
>  +                    if report.get_name() is None:
>  +                        report.set_name(argv[i+1])
>  +                        i += 2
>  +                        continue
>  +                    else:
>  +                        print("Report name already specified!",
>  +                              file=sys.stderr)
>  +                        return -1
>  +                elif argv[i] == "type":
>  +                    report.set_type(argv[i+1])
>  +                    i += 2
>  +                    continue
>  +                elif argv[i] == "chart":
>  +                    chart, new_i = self._parse_chart_add(argv[i+1:])
>  +                    charts.append(chart)
>  +                    i += 1 + new_i
>  +                    continue
>  +                else:
>  +                    print("Parameter '%s' not defined/implemented!"
> %\
>  +                            argv[i], file=sys.stderr)
>  +                    return -1
>  +        except IndexError:
>  +            print("Parameter '%s' requires a value!" % argv[i])
>  +            return -1
>  +
>  +        if report.get_name() is None:
>  +            print("Report name not specified!", file=sys.stderr)
>  +            return -1
>  +
>  +        for chart in charts:
>  +            self._report_add_chart(report, chart)
>  +
>  +        report = self._perf_api.report_create(report)
>  +        print("Created report with url: %s" %
>  self._perf_api.get_obj_url(report))
>  +        return 0
>  +
>  +    def _do_update(self, argv):
>  +        report_id = None
>  +        try:
>  +            if argv[1] != "id":
>  +                print("Parameter 'id' is required!", file=sys.stderr)
>  +                return -1
>  +            report_id = str(int(argv[2]))
>  +        except IndexError:
>  +            print("Parameter 'id' is required!", file=sys.stderr)
>  +            return -1
>  +        except ValueError:
>  +            print("Value of parameter 'id' must be a number!",
>  file=sys.stderr)
>  +            return -1
>  +
>  +        report = self._perf_api.report_get_by_id(report_id)
>  +        if report is None:
>  +            print("Invalid ID specified!", file=sys.stderr)
>  +            return -1
>  +
>  +        i = 3
>  +        while i < len(argv):
>  +            if argv[i] == "name":
>  +                report.set_name(argv[i+1])
>  +                i += 2
>  +                continue
>  +
>  +            op = "edit"
>  +            if argv[i] in ["add", "del", "edit"]:
>  +                op = argv[i]
>  +                i += 1
>  +            if argv[i] == "chart":
>  +                if op == "add":
>  +                    chart, new_i = self._parse_chart_add(argv[i+1:])
>  +                    i += 1 + new_i
>  +
>  +                    self._report_add_chart(report, chart)
>  +                elif op == "edit":
>  +                    chart_num = int(argv[i+1])
>  +                    i += 2
>  +                    while i < len(argv):
>  +                        if argv[i] == "name":
>  +                            report.set_chart_name(chart_num, argv[i+1])
>  +                            i += 2
>  +                            continue
>  +                        elif argv[i] == "testid":
>  +                            report.set_chart_test_id(chart_num, argv[i+1])
>  +                            i += 2
>  +                            continue
>  +                        elif argv[i] == "testuid":
>  +                            test =
>  self._perf_api.test_get_by_uid(argv[i+1])
>  +                            report.set_chart_test_id(chart_num,
>  test.get_id())
>  +                            i += 2
>  +                            continue
>  +
>  +                        op2 = "edit"
>  +                        if argv[i] in ["add", "del",
> "edit"]:
>  +                            op = argv[i]
>  +                            i += 1
>  +
>  +                        if argv[i] == "series":
>  +                            if op == "add":
>  +                                series, new_i =
>  self._parse_series(argv[i+1:])
>  +                                i += 1 + new_i
>  +                                try:
>  +                                    report.add_series(chart_num,
>  +                                                      series["name"],
>  +                                                      series["metric"],
>  +                                                      series["tags"])
>  +                                except KeyError as e:
>  +                                    print("Parameter '%s' is required for
>  a series!"\
>  +                                          % e.args[0])
>  +                                    return -1
>  +                            elif op == "edit":
>  +                                series_num = int(argv[i+1])
>  +                                i += 2
>  +                                while i < len(argv):
>  +                                    if argv[i] == "name":
>  +                                        report.set_series_name(chart_num,
>  +                                                               series_num,
>  +                                                               argv[i+1])
>  +                                        i += 2
>  +                                        continue
>  +                                    elif argv[i] == "metric":
>  +
>  report.set_series_metric(chart_num,
>  +
>   series_num,
>  +
>   argv[i+1])
>  +                                        i += 2
>  +                                        continue
>  +                                    elif argv[i] == "+tags":
>  +                                        tags = argv[i+1].split(',')
>  +                                        report.add_series_tags(chart_num,
>  +                                                               series_num,
>  +                                                               tags)
>  +                                        i += 2
>  +                                        continue
>  +                                    elif argv[i] == "-tags":
>  +                                        tags = argv[i+1].split(',')
>  +
>  report.remove_series_tags(chart_num,
>  +
>  series_num,
>  +                                                                  tags)
>  +                                        i += 2
>  +                                        continue
>  +                                    else:
>  +                                        break
>  +                            elif op == "del":
>  +                                series_num = argv[i+1]
>  +                                report.del_series(chart_num, series_num)
>  +                                i += 2
>  +                                continue
>  +                        elif argv[i] == "baseline":
>  +                            if op == "add":
>  +                                baseline, new_i =
>  self._parse_baseline(argv[i+1:])
>  +                                i += 1 + new_i
>  +
>  +                                try:
>  +                                    report.add_baseline(None,
>  baseline["name"],
>  +
>  baseline["metric"],
>  +
>  baseline["execid"])
>  +                                except KeyError as e:
>  +                                    print("Parameter '%s' is required for
>  a baseline!"\
>  +                                          % e.args[0])
>  +                                    return -1
>  +                            elif op == "edit":
>  +                                baseline_num = argv[i+1]
>  +                                i += 2
>  +                                while i < len(argv):
>  +                                    if argv[i] == "name":
>  +
>  report.set_baseline_name(chart_num,
>  +
>   baseline_num,
>  +
>   argv[i+1])
>  +                                        i += 2
>  +                                        continue
>  +                                    elif argv[i] == "metric":
>  +
>  report.set_baseline_metric(chart_num,
>  +
>   baseline_num,
>  +
>   argv[i+1])
>  +                                        i += 2
>  +                                        continue
>  +                                    elif argv[i] == "execid":
>  +
>  report.set_baseline_execid(chart_num,
>  +
>   baseline_num,
>  +
>   argv[i+1])
>  +                                        i += 2
>  +                                        continue
>  +                                    else:
>  +                                        break
>  +                            elif op == "del":
>  +                                baseline_num = argv[i+1]
>  +                                report.del_baseline(chart_num,
>  baseline_num)
>  +                                i += 2
>  +                                continue
>  +                        else:
>  +                            break
>  +
>  +                elif op == "del":
>  +                    chart_num = int(argv[i+1])
>  +                    report.del_chart(chart_num)
>  +                    i += 2
>  +                    continue
>  +            else:
>  +                print("Unknown parameter '%s'!" % argv[i])
>  +                return -1
>  +        self._perf_api.report_update(report)
>  +        return 0
>  
​splitting this method into smaller logical chunks would significantly
improve readability of the code​


>  +
>  +    def run(self):
>  +        argv = self._argv
>  +        if len(argv) == 0:
>  +            return -1
>  +        elif argv[0] == "help":
>  +            self.print_help()
>  +            return 0
>  +        elif argv[0] in ["get", "show"]:
>  +            try:
>  +                report_id = int(argv[1])
>  +                report = self._perf_api.report_get_by_id(report_id)
>  +                print(report)
>  +            except IndexError:
>  +                print("No ID specified!", file=sys.stderr)
>  +                return -1
>  +            except ValueError:
>  +                print("ID needs to be an integer!", file=sys.stderr)
>  +                return -1
>  +        elif argv[0] in ["create"]:
>  +            return self._do_create(argv)
>  +        elif argv[0] in ["update"]:
>  +            return self._do_update(argv)
>  +        else:
>  +            print("Command '%s' not implemented for Reports." %
> argv[0],
>  file=sys.stderr)
>  +            return -1
>  +        return 0 
+
>  +def main():
>  +    """
>  +    Main function
>  +    """
>  +    cli_classes = {"report": ReportCLI,
>  +                   "testexec": TestExecCLI,
>  +                   "test": TestCLI}
>  +    obj = None
>  +    conf_file = None
>  +    url = None
>  +    username = None
>  +    password = None
>  +
>  +    i = 1
>  +    while obj is None and i < len(sys.argv):
>  +        if sys.argv[i] in cli_classes:
>  +            obj = sys.argv[i]
>  +            i += 1
>  +        elif sys.argv[i] in ["-u", "--url"]:
>  +            url = sys.argv[i+1]
>  +            i += 2
>  +        elif sys.argv[i] in ["-n", "--username"]:
>  +            username = sys.argv[i+1]
>  +            i += 2
>  +        elif sys.argv[i] in ["-p", "--password"]:
>  +            password = sys.argv[i+1]
>  +            i += 2
>  +        elif sys.argv[i] in ["-c", "--config"]:
>  +            conf_file = sys.argv[i+1]
>  +            i += 2
>  +        else:
>  +            usage(-1)
>  
​wouldn't using getopt be cleaner solution than this?
​

>  +
>  +    if obj is None:
>  +        usage(-1)
>  +    else:
>  +        lnst_config.controller_init()
>  +        dirname = os.path.dirname(sys.argv[0])
>  +        gitcfg = os.path.join(dirname, "lnst-ctl.conf")
>  +        if os.path.isfile(gitcfg):
>  +            lnst_config.load_config(gitcfg)
>  +        else:
>  +            lnst_config.load_config('/etc/lnst-ctl.conf')
>  +
>  +        usr_cfg = os.path.expanduser('~/.lnst/lnst-ctl.conf')
>  +        if os.path.isfile(usr_cfg):
>  +            lnst_config.load_config(usr_cfg)
>  +
>  +        if conf_file is not None:
>  +            lnst_config.load_config(conf_file)
>  +
>  +        cli = cli_classes[obj](url, username, password, sys.argv[i:])
>  +        ret_val = cli.run()
>  +
>  +        if ret_val < 0:
>  +            cli.print_help()
>  +        return ret_val
>  +
>  +    return 0
>  
​​maybe using RV_OK, RV_ERR​ or similar named constants instead of magic
numbers would look better?​


>  +
>  +if __name__ == "__main__":
>  +    sys.exit(main())
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[PATCH 18/19] perfrepo-cli: add report deletion and get for Test and TestExecs

[Jiri Prochazka]

comments about help() on stderr and magic numbers in return codes apply
here as well as in previous patch

more comments inline

2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>
>  This patch implements report delete functionality and get/show
>  functionality for Test and TestExecution objects.
>
>  For test get, we try both by_id and by_uid options.
>
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   perfrepo | 88
>  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
>   1 file changed, 86 insertions(+), 2 deletions(-)
>
>  diff --git a/perfrepo b/perfrepo
>  index cda306c..8f6349b 100755
>  --- a/perfrepo
>  +++ b/perfrepo
>  @@ -66,10 +66,78 @@ class GenericCLI(object):
>           return -1
>
>   class TestCLI(GenericCLI):
>  -    pass
>  +    def print_help(self):
>  +        """
>  +        Print usage for the report object
>  +        """
>  +        print("Usage: %s test help" % sys.argv[0], file=sys.stderr)
>  +        print("", file=sys.stderr)
>  +        print("       %s test get {ID | UID}" % sys.argv[0],
>  file=sys.stderr)
>  +        print("       %s test show {ID | UID}" % sys.argv[0],
>  file=sys.stderr)
>  +
>  +    def run(self):
>  +        argv = self._argv
>  +        if len(argv) == 0:
>  +            return -1
>  +        elif argv[0] == "help":
>  +            self.print_help()
>  +            return 0
>  +        elif argv[0] in ["get", "show"]:
>  +            try:
>  +                test_id = int(argv[1])
>  +                test = self._perf_api.test_get_by_id(test_id)
>  +                if test is None:
>  +                    test = self._perf_api.test_get_by_uid(test_id)
>  +                if test is None:
>  +                    print("Test not found.")
>  +                else:
>  +                    print(test)
>  +            except IndexError:
>  +                print("No ID specified!", file=sys.stderr)
>  +                return -1
>  +            except ValueError:
>  +                print("ID needs to be an integer!", file=sys.stderr)
>  +                return -1
>  +        else:
>  +            print("Command '%s' not implemented for Tests." %
> argv[0],
>  file=sys.stderr)
>  +            return -1
>  +        return 0
>
>   class TestExecCLI(GenericCLI):
>  -    pass
>  +    def print_help(self):
>  +        """
>  +        Print usage for the report object
>  +        """
>  +        print("Usage: %s texec help" % sys.argv[0], file=sys.stderr)
>  +        print("", file=sys.stderr)
>  +        print("       %s texec get ID" % sys.argv[0], file=sys.stderr)
>  +        print("       %s texec show ID" % sys.argv[0], file=sys.stderr)
>  +
>  +    def run(self):
>  +        argv = self._argv
>  +        if len(argv) == 0:
>  +            return -1
>  +        elif argv[0] == "help":
>  +            self.print_help()
>  +            return 0
>  +        elif argv[0] in ["get", "show"]:
>  +            try:
>  +                exec_id = int(argv[1])
>  +                texec = self._perf_api.testExecution_get(exec_id)
>  +                if texec is None:
>  +                    print("TestExecution not found.")
>  +                else:
>  +                    print(texec)
>  +            except IndexError:
>  +                print("No ID specified!", file=sys.stderr)
>  +                return -1
>  +            except ValueError:
>  +                print("ID needs to be an integer!", file=sys.stderr)
>  +                return -1
>  
​since more opts will be implemented in future, each method should have
it's own method for better readability
and sustainability


>  +        else:
>  +            print("Command '%s' not implemented for TestExecutions."
> %
>  argv[0], file=sys.stderr)
>  +            return -1
>  +        return 0
>
>   class ReportCLI(GenericCLI):
>       def print_help(self):
>  @@ -110,6 +178,8 @@ class ReportCLI(GenericCLI):
>           print("                     edit is implicit - noOP ==
> 'edit'",
>  file=sys.stderr)
>           print("                     OPs 'edit' and 'del' require
> NUM,
>  whereas 'add' requires NAME", file=sys.stderr)
>           print("                     if chart OP == 'add' then all further
>  OPs are 'add' as in the 'report create' command", file=sys.stderr)
>  +        print("", file=sys.stderr)
>  +        print("       %s report delete ID" % sys.argv[0], file=sys.stderr)
>  
​this should be in previous commit​


>       def _parse_baseline(self, argv):
>           baseline = {}
>  @@ -450,6 +520,20 @@ class ReportCLI(GenericCLI):
>               return self._do_create(argv)
>           elif argv[0] in ["update"]:
>               return self._do_update(argv)
>  +        elif argv[0] in ["delete"]:
>  +            try:
>  +                report_id = int(argv[1])
>  +                result = self._perf_api.report_delete_by_id(report_id)
>  +                if result:
>  +                    print("Report deleted.")
>  +                else:
>  +                    print("Report delete failed.")
>  +            except IndexError:
>  +                print("No ID specified!", file=sys.stderr)
>  +                return -1
>  +            except ValueError:
>  +                print("ID needs to be an integer!", file=sys.stderr)
>  +                return -1
>           else:
>               print("Command '%s' not implemented for Reports." %
> argv[0],
>  file=sys.stderr)
>               return -1
>  --
>  2.5.2
>
>  _______________________________________________
>  LNST-developers mailing list
>  LNST-developers(a)lists.fedorahosted.org
>  https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
>  


-- 
​Best regards,​

Jiri Prochazka
LNST Developer
​| www.lnst-project.org​

[phone] | jprochaz(a)redhat.com
Red Hat Czech | Purkyňova 71/99, 612 00 Brno

[Jan Tluka]

Tue, Sep 15, 2015 at 01:18:54AM EDT, jprochaz(a)redhat.com wrote:
> 2015-09-15 4:10 GMT+02:00 Jan Tluka <jtluka(a)redhat.com&gt;:
>
> > Mon, Sep 14, 2015 at 08:26:40AM EDT, jprochaz(a)redhat.com wrote:
> > >2015-09-14 14:05 GMT+02:00 <olichtne(a)redhat.com&gt;:
> > >
> > >> From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> > >>
> > >> People from different time zones can use the same PerfRepo instance,
> > >> automatically using UTC time stamps will avoid incorrect sorting of
> > >> results (by date).
> > >>
> > >> Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
> > >> ---
> > >>  lnst/Controller/PerfRepo.py | 4 ++--
> > >>  1 file changed, 2 insertions(+), 2 deletions(-)
> > >>
> > >> diff --git a/lnst/Controller/PerfRepo.py b/lnst/Controller/PerfRepo.py
> > >> index e244321..4418902 100644
> > >> --- a/lnst/Controller/PerfRepo.py
> > >> +++ b/lnst/Controller/PerfRepo.py
> > >> @@ -121,7 +121,7 @@ class PerfRepoTestExecution(PerfRepoObject):
> > >>          if type(xml) is NoneType:
> > >>              self._id = None
> > >>              self._name = None
> > >> -            self._started = datetime.datetime.now().isoformat()
> > >> +            self._started = datetime.datetime.utcnow().isoformat()
> > >>              self._testId = None
> > >>              self._testUid = None
> > >>              self._comment = ""
> > >> @@ -173,7 +173,7 @@ class PerfRepoTestExecution(PerfRepoObject):
> > >>
> > >>      def set_started(self, date=None):
> > >>          if isinstance(date, NoneType):
> > >> -            date = datetime.datetime.now()
> > >> +            date = datetime.datetime.utcnow().isoformat()
> > >>              self._started = date.isoformat()
> > >>
> > >
> > >​isoformat() returns type str, so execution fails on AttributeError
> > >exception​
> > >​Either don't call isoformat() on line with utcnow() or on the line below​
> > >
> > >
> > >
> >
> > Hmm, I don't see that problem on my setup. With which python version do
> > you see that?
> >
> > Python 2.7.8 (default, Jul  5 2015, 14:16:16)
> > [GCC 4.9.2 20150212 (Red Hat 4.9.2-6)] on linux2
> > Type "help", "copyright", "credits" or
> "license" for more information.
> > >>> import datetime
> > >>> a = datetime.datetime.now().isoformat()
> > >>> b = datetime.datetime.utcnow().isoformat()
> > >>> a
> > '2015-09-14T22:06:13.488851'
> > >>> b
> > '2015-09-15T02:06:20.313035'
> >
> >
> ​The problem is not with utcnow() but with isoformat() called twice, second
> time on str object, see this:
> Python 2.7.10 (default, Jul  5 2015, 14:15:43)
> [GCC 5.1.1 20150618 (Red Hat 5.1.1-4)] on linux2
> Type "help", "copyright", "credits" or "license"
> for more information.
> >>> import datetime
> >>> date = datetime.datetime.utcnow().isoformat()
> >>> started = date.isoformat()
> Traceback (most recent call last):
>   File "<stdin>", line 1, in <module>
> AttributeError: 'str' object has no attribute 'isoformat'
> ​
>  
Oh, ok. Missed it. Valid point then.

-Jan

> > >>          else:
> > >>              self._started = date
> > >> --
> > >> 2.5.2
> > >>
> > >> _______________________________________________
> > >> LNST-developers mailing list
> > >> LNST-developers(a)lists.fedorahosted.org
> > >> https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
> > >>
> > >
> > >
> > >
> > >--
> > >​Best regards,​
> > >
> > >Jiri Prochazka
> > >LNST Developer
> > >​| www.lnst-project.org​
> > >
> > >[phone] | jprochaz(a)redhat.com
> > >Red Hat Czech | Purkyňova 71/99, 612 00 Brno
> >
> > >_______________________________________________
> > >LNST-developers mailing list
> > &gt;LNST-developers(a)lists.fedorahosted.org
> > >https://lists.fedorahosted.org/mailman/listinfo/lnst-developers
> >
> >
>
>
> -- 
> ​Best regards,​
>
> Jiri Prochazka
> LNST Developer
> ​| www.lnst-project.org​
>
> [phone] | jprochaz(a)redhat.com
> Red Hat Czech | Purkyňova 71/99, 612 00 Brno