Merge pull request #3 from xebialabs-community/listBookmarks

jdewinne · web-flow · commit 37ae89074ad7 · 2018-10-19T16:46:37.000-07:00
List bookmarks
diff --git a/build.gradle b/build.gradle
@@ -40,8 +40,9 @@ sourceSets.test.resources.srcDirs = ["src/test/jython", "src/test/resources"]
 
 
 task testJython(type: Exec, dependsOn: ['testClasses']) {
-  environment = ["itest_conf_file": "$projectDir/src/test/jython/itests/itest-conf.json","CLASSPATH": sourceSets.test.runtimeClasspath.asPath, "PATH": System.getenv("PATH"), "HOME": System.getenv("HOME")]
-  commandLine jythonInterpreter, "-Dpython.path=/opt/xlr/server/plugins/xlr-xld-plugin-7.1.0.jar", "-m", "unittest", "discover", "-s", "./src/test/jython", "-p", "*_test.py", "-v"
+  def classpath = sourceSets.main.runtimeClasspath.asPath + ":$projectDir/build/jython/main:$projectDir/src/main/resources"
+  environment = ["itest_conf_file": "$projectDir/src/test/jython/itests/itest-conf.json","CLASSPATH": classpath, "PATH": System.getenv("PATH"), "HOME": System.getenv("HOME")]
+  commandLine jythonInterpreter, "-m", "unittest", "discover", "-s", "./src/test/jython", "-p", "*_test.py", "-v"
   workingDir = projectDir
 }
 
diff --git a/src/main/resources/delphix/DelphixClient.py b/src/main/resources/delphix/DelphixClient.py
@@ -7,205 +7,50 @@
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
-
-import requests
 import json
 
+from delphixpy.web.selfservice import bookmark
+from delphixpy.web.selfservice import branch
 
-class DelphixClient:
-
-    def __init__(self, server):
-        self.server = server
-        self.cookies = self.get_session()
-
-    def get_session(self):
-        print('- open session on {0}'.format(self.server['url']))
-        headers = {'Content-type': 'application/json'}
-        data = {
-            "type": "APISession",
-            "version": {
-                "type": "APIVersion",
-                "major": 1,
-                "minor": 8,
-                "micro": 2
-            }
-        }
-
-        r = requests.post('{0}/resources/json/delphix/session'.format(self.server['url']),
-                          headers=headers,
-                          data=json.dumps(data))
-        return r.cookies
-
-    def _login(self):
-        print('- login')
-        headers = {'Content-type': 'application/json'}
-        data = {
-            "type": "LoginRequest",
-            "username": self.server['username'],
-            "password": self.server['password'],
-        }
-        r = requests.post('{0}/resources/json/delphix/login'.format(self.server['url']),
-                          headers=headers,
-                          cookies=self.cookies,
-                          data=json.dumps(data))
-
-        if self._response_ok(r):
-            print("- Authenticated ! ")
-        else:
-            raise self._response_error(r)
-        return r.text
-
-    def _logout(self):
-        print('- logout')
-        headers = {'Content-type': 'application/json'}
-        requests.post('{0}/resources/json/delphix/logout'.format(self.server['url']),
-                      headers=headers,
-                      cookies=self.cookies)
-
-    def _get_params(self, vdb):
-        result = {'ref': 'NOT_FOUND', 'cont': 'NOT_FOUND', 'vsrc': 'NOT_FOUND'}
-        print('- get params')
-        headers = {'Content-type': 'application/json'}
-
-        r = requests.get('{0}/resources/json/delphix/database'.format(self.server['url']),
-                         headers=headers,
-                         cookies=self.cookies)
+from delphix.lib.DelphixSession import DelphixSession
+from delphix.lib.GetReferences import find_obj_name
+import delphix.lib.Util as Util
 
-        for db in r.json()['result']:
-            if db['name'] == vdb:
-                result['ref'] = db['reference']
-                result['cont'] = db['provisionContainer']
 
-        r = requests.get('{0}/resources/json/delphix/source'.format(self.server['url']),
-                         headers=headers,
-                         cookies=self.cookies)
+class DelphixClient(object):
 
-        for db in r.json()['result']:
-            if db['name'] == vdb:
-                result['vsrc'] = db['reference']
-
-        print('- database reference {ref}'.format(**result))
-        print('- database provisionContainer {cont}'.format(**result))
-        print('- source reference {vsrc}'.format(**result))
-        return result
-
-    def _rewind(self, vdb):
-        parameters = self._get_params(vdb=vdb)
-        print("- rewind ")
-        headers = {'Content-type': 'application/json'}
-        data = {
-            "type": "OracleRollbackParameters",
-            "timeflowPointParameters": {
-                "type": "TimeflowPointSemantic",
-                "container": parameters['ref'],
-                "location": "LATEST_SNAPSHOT"
-            }
-        }
-
-        r = requests.post(
-            '{0}/resources/json/delphix/database/{1}/rollback'.format(self.server['url'], parameters['ref']),
-            headers=headers,
-            cookies=self.cookies,
-            data=json.dumps(data))
-        if self._response_ok(r):
-            print("- Job    {0}".format(r.json()['job']))
-            print("- Action {0}".format(r.json()['action']))
-            return {'job': r.json()['job'], 'action': r.json()['action']}
-        else:
-            raise self._response_error(r)
-
-    def _snapshot(self, vdb):
-        parameters = self._get_params(vdb=vdb)
-        print("- snapshot ")
-        headers = {'Content-type': 'application/json'}
-        data = {
-            "type": "OracleSyncParameters"
-        }
-
-        r = requests.post(
-            '{0}/resources/json/delphix/database/{1}/sync'.format(self.server['url'], parameters['ref']),
-            headers=headers,
-            cookies=self.cookies,
-            data=json.dumps(data))
-
-        if self._response_ok(r):
-            print("- Job    {0}".format(r.json()['job']))
-            print("- Action {0}".format(r.json()['action']))
-            return {'job': r.json()['job'], 'action': r.json()['action']}
-        else:
-            raise self._response_error(r)
-
-    def _stop(self, vdb):
-        parameters = self._get_params(vdb=vdb)
-        print("- stop ")
-        headers = {'Content-type': 'application/json'}
- #       data = {
- #           "type": "OracleSyncParameters"
- #       }
-
-        r = requests.post(
-            '{0}/resources/json/delphix/database/{1}/stop'.format(self.server['url'], parameters['ref']),
-            headers=headers,
-            cookies=self.cookies,
- #           data=json.dumps(data))
+    def __init__(self, server):
+        self.engine = DelphixSession.create(server).server_session
 
-        if self._response_ok(r):
-            print("- Job    {0}".format(r.json()['job']))
-            print("- Action {0}".format(r.json()['action']))
-            return {'job': r.json()['job'], 'action': r.json()['action']}
-        else:
-            raise self._response_error(r)
 
-    def _start(self, vdb):
-        parameters = self._get_params(vdb=vdb)
-        print("- snapshot ")
-        headers = {'Content-type': 'application/json'}
- #       data = {
- #           "type": "OracleSyncParameters"
- #       }
+    @staticmethod
+    def create_client(http_connection):
+        return DelphixClient(http_connection)
 
-        r = requests.post(
-            '{0}/resources/json/delphix/database/{1}/start'.format(self.server['url'], parameters['ref']),
-            headers=headers,
-            cookies=self.cookies)
-#            data=json.dumps(data))
+    def delphix_listbookmarks(self, variables):
+        js_bookmarks = bookmark.get_all(self.engine)
 
-        if self._response_ok(r):
-            print("- Job    {0}".format(r.json()['job']))
-            print("- Action {0}".format(r.json()['action']))
-            return {'job': r.json()['job'], 'action': r.json()['action']}
-        else:
-            raise self._response_error(r)
-    def _response_ok(self, r):
-        return r.status_code == 200 and r.json()['type'] == 'OKResult'
+        path = Util.split_path(variables['template_path'])
 
-    def _response_error(self, r):
-        return Exception(r.text)
+        result = []
+        for js_bookmark in js_bookmarks:
+            if js_bookmark.template_name != path['template_name']:
+                continue
 
-    def snapshot(self, vdb):
-        self._login()
-        print("- Snapshot {0} with Delphix".format(vdb))
-        result = self._snapshot(vdb)
-        self._logout()
-        return result
+            add_it = False
+            if variables['tag_filter'] is None:
+                tag = js_bookmark.tags if js_bookmark.tags else None
+                add_it = True
+            else:
+                for tag in variables['tag_filter']:
+                    if tag in js_bookmark.tags:
+                        add_it = True
+                        break
 
-    def rewind(self, vdb):
-        self._login()
-        print("- Rewind {0} with Delphix".format(vdb))
-        result = self._rewind(vdb)
-        self._logout()
-        return result
-		
-    def stop(self, vdb):
-        self._login()
-        print("- Stop {0} with Delphix".format(vdb))
-        result = self._stop(vdb)
-        self._logout()
-        return result
+            if add_it:
+                branch_name = find_obj_name(self.engine, branch, js_bookmark.branch)
+                key = Util.form_bookmark_path(js_bookmark.template_name, js_bookmark.container_name, branch_name, js_bookmark.name)
+                result.append(key)
+                print "%s\n" % key
 
-    def start(self, vdb):
-        self._login()
-        print("- start {0} with Delphix".format(vdb))
-        result = self._start(vdb)
-        self._logout()
-        return result	
+        variables['bookmarks'] = result
diff --git a/src/main/resources/delphix/DelphixTask.py b/src/main/resources/delphix/DelphixTask.py
@@ -0,0 +1,16 @@
+#
+# Copyright 2017 XEBIALABS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+from delphix.DelphixClient import DelphixClient
+
+delphix_client = DelphixClient.create_client(server)
+method = str(task.getTaskType()).lower().replace('.', '_')
+call = getattr(delphix_client, method)
+output = call(locals())
diff --git a/src/main/resources/delphix/lib/GetReferences.py b/src/main/resources/delphix/lib/GetReferences.py
@@ -13,8 +13,6 @@
 """
 
 import re
-from datetime import datetime
-from dateutil import tz
 
 from delphixpy.v1_9_0.web.service import time
 from delphixpy.v1_9_0.exceptions import RequestError
@@ -35,30 +33,6 @@
 
 VERSION = 'v.0.2.0019'
 
-def convert_timestamp(engine, timestamp):
-    """
-    Convert timezone from Zulu/UTC to the Engine's timezone
-    engine: A Delphix engine session object.
-    timestamp: the timstamp in Zulu/UTC to be converted
-    """
-
-    default_tz = tz.gettz('UTC')
-    engine_tz = time.time.get(engine)
-
-    try:
-        convert_tz = tz.gettz(engine_tz.system_time_zone)
-        utc = datetime.strptime(timestamp, '%Y-%m-%dT%H:%M:%S')
-        utc = utc.replace(tzinfo=default_tz)
-        converted_tz = utc.astimezone(convert_tz)
-        engine_local_tz = '{} {} {}'.format(str(converted_tz.date()),
-                                            str(converted_tz.time()),
-                                            str(converted_tz.tzname()))
-
-        return engine_local_tz
-    except TypeError:
-        return None
-
-
 def find_all_objects(engine, f_class):
     """
     Return all objects from a given class
diff --git a/src/main/resources/delphix/listBookmarks.py b/src/main/resources/delphix/listBookmarks.py
diff --git a/src/main/resources/synthetic.xml b/src/main/resources/synthetic.xml
@@ -21,6 +21,7 @@
 
 
     <type type="delphix.Task" extends="xlrelease.PythonScript" virtual="true">
+        <property name="scriptLocation" default="delphix/DelphixTask.py" hidden="true"/>
         <property name="iconLocation" default="delphix/delphix.png" hidden="true"/>
         <property name="taskColor" hidden="true" default="#70767a"/>
 
diff --git a/src/test/jython/itests/Bookmarks_list_test.py b/src/test/jython/itests/Bookmarks_list_test.py
@@ -0,0 +1,23 @@
+#
+# Copyright 2017 XEBIALABS
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+
+
+import unittest
+from itests import DelphixServerCi
+from delphix.DelphixClient import DelphixClient
+
+
+class ListBookmarks(unittest.TestCase):
+    def test_list_bookmarks(self):
+        client = DelphixClient.create_client(DelphixServerCi())
+        variables = {"template_path": "/something" }
+        client.delphix_listbookmarks(variables)
+        self.assertIsNotNone(variables["bookmarks"])
diff --git a/src/test/jython/itests/itest-conf.json b/src/test/jython/itests/itest-conf.json

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,9 @@ sourceSets.test.resources.srcDirs = ["src/test/jython", "src/test/resources"]`
`40`	`40`
`41`	`41`
`42`	`42`	`task testJython(type: Exec, dependsOn: ['testClasses']) {`
`43`		`- environment = ["itest_conf_file": "$projectDir/src/test/jython/itests/itest-conf.json","CLASSPATH": sourceSets.test.runtimeClasspath.asPath, "PATH": System.getenv("PATH"), "HOME": System.getenv("HOME")]`
`44`		`- commandLine jythonInterpreter, "-Dpython.path=/opt/xlr/server/plugins/xlr-xld-plugin-7.1.0.jar", "-m", "unittest", "discover", "-s", "./src/test/jython", "-p", "*_test.py", "-v"`
	`43`	`+ def classpath = sourceSets.main.runtimeClasspath.asPath + ":$projectDir/build/jython/main:$projectDir/src/main/resources"`
	`44`	`+ environment = ["itest_conf_file": "$projectDir/src/test/jython/itests/itest-conf.json","CLASSPATH": classpath, "PATH": System.getenv("PATH"), "HOME": System.getenv("HOME")]`
	`45`	`+ commandLine jythonInterpreter, "-m", "unittest", "discover", "-s", "./src/test/jython", "-p", "*_test.py", "-v"`
`45`	`46`	`workingDir = projectDir`
`46`	`47`	`}`
`47`	`48`