Merge pull request #7 from xebialabs-community/rollbackDatabase

Adding an automated test for rollback database

Author: jdewinne

build.gradle

@@ -35,8 +35,8 @@ if (!project.hasProperty('jythonInterpreter')) {
   project.ext['jythonInterpreter'] = "jython"
 }
 
-sourceSets.main.resources.srcDirs = ["src/main/jython", "src/main/resources"]
-sourceSets.test.resources.srcDirs = ["src/test/jython", "src/test/resources"]
+// sourceSets.main.resources.srcDirs = ["src/main/jython", "src/main/resources"]
+// sourceSets.test.resources.srcDirs = ["src/test/jython", "src/test/resources"]
 
 
 task testJython(type: Exec, dependsOn: ['testClasses']) {

src/main/resources/delphix/DelphixClient.py

@@ -69,4 +69,7 @@ def delphix_refreshdatabase(self, variables):
         return database.refresh(self.engine, variables['vdb'], None)
 
     def delphix_syncdatabase(self, variables):
-        return database.sync(self.engine, variables['vdb'], None)
+        return database.sync(self.engine, variables['vdb'], None)
+
+    def delphix_rollbackdatabase(self, variables):
+        return database.rollback(self.engine, variables['vdb'], None)

src/main/resources/synthetic.xml

@@ -51,13 +51,8 @@
         <property name="vdb" category="input"/>
     </type>
 
-    <type type="delphix.Rewind" extends="delphix.Task">
-
+    <type type="delphix.rollbackDatabase" extends="delphix.Task">
         <property name="vdb" category="input"/>
-
-        <property name="job" category="output" required="false"/>
-        <property name="action" category="output" required="false"/>
-
     </type>
 
 

src/main/resources/delphix/Rewind.py …/jython/itests/Database_rollback_test.pysrc/main/resources/delphix/Rewind.py renamed to src/test/jython/itests/Database_rollback_test.py src/main/resources/delphix/Rewind.py renamed to src/test/jython/itests/Database_rollback_test.py

@@ -8,16 +8,18 @@
 # 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.
 #
 
-if __name__ == '__main__':
-    import sys
 
-    sys.path.append('/Users/bmoussaud/Workspace/xebialabs-community/xlr-delphix-plugin/src/main/resources')
-    server = {'url': 'http://ba5b5824.ngrok.io', 'username': 'delphix_admin', 'password': 'landshark'}
-    vdb = 'XEBIA'
 
+import unittest
+from itests import DelphixServerCi
 from delphix.DelphixClient import DelphixClient
+from delphix.lib.DlpxException import DlpxException
 
-client = DelphixClient(server)
-output = client.rewind(vdb)
-job = output['job']
-action = output['action']
+
+class RollbackDatabase(unittest.TestCase):
+
+
+    def test_rollback_database(self):
+        client = DelphixClient.create_client(DelphixServerCi())
+        variables = {"vdb": "somevirtualdatabase" }
+        client.delphix_rollbackdatabase(variables)

src/test/resources/docker/delphix/main.go

@@ -19,6 +19,7 @@ func main() {
 	router := mux.NewRouter().StrictSlash(true)
 	router.HandleFunc("/resources/json/delphix/database/{ref_id}/refresh", ReturnDatabaseResponse).Methods("POST")
 	router.HandleFunc("/resources/json/delphix/database/{ref_id}/sync", ReturnDatabaseResponse).Methods("POST")
+	router.HandleFunc("/resources/json/delphix/database/{ref_id}/rollback", ReturnDatabaseResponse).Methods("POST")
 
 	router.HandleFunc("/resources/json/delphix/login", ReturnLoginResponse).Methods("POST")