Merge pull request #67 from HTTP-APIs/develop

Sync with develop

Author: xadahiya

Dockerfile

@@ -6,10 +6,10 @@ MAINTAINER Sandeep Chauhan <sandeepsajan0@gmail.com>
 COPY ./requirements.txt /home/requirements.txt
 RUN pip install -r /home/requirements.txt
 
-COPY ./hydra_redis /home/app/hydra_redis
+COPY ./hydra_agent /home/app/hydra_agent
 ENV PYTHONPATH $PYTHONPATH:/home/app/
 
-ENTRYPOINT ["python", "/home/app/hydra_redis/querying_mechanism.py"]
+ENTRYPOINT ["python", "/home/app/hydra_agent/querying_mechanism.py"]
 
 
 

hydra_redis/__init__.py hydra_agent/__init__.pyhydra_redis/__init__.py renamed to hydra_agent/__init__.py

@@ -3,7 +3,7 @@
 import re
 import logging
 from urllib.error import URLError, HTTPError
-from hydra_redis.classes_objects import ClassEndpoints,RequestError
+from hydra_agent.classes_objects import ClassEndpoints,RequestError
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

hydra_redis/classes_objects.py hydra_agent/classes_objects.pyhydra_redis/classes_objects.py renamed to hydra_agent/classes_objects.py

@@ -5,9 +5,9 @@
 from hydrus.hydraspec import doc_maker
 import hydrus
 from graphviz import Digraph
-from hydra_redis.classes_objects import ClassEndpoints,RequestError
-from hydra_redis.collections_endpoint import CollectionEndpoints
-from hydra_redis.redis_proxy import RedisProxy
+from hydra_agent.classes_objects import ClassEndpoints,RequestError
+from hydra_agent.collections_endpoint import CollectionEndpoints
+from hydra_agent.redis_proxy import RedisProxy
 
 
 class InitialGraph:

hydra_redis/collections_endpoint.py hydra_agent/collections_endpoint.pyhydra_redis/collections_endpoint.py renamed to hydra_agent/collections_endpoint.py

@@ -1,14 +1,14 @@
 import random
 import string
 import logging
-from hydra_redis.hydra_graph import InitialGraph
+from hydra_agent.hydra_graph import InitialGraph
 import urllib.request
 import json
 from hydrus.hydraspec import doc_maker
 from urllib.error import URLError, HTTPError
-from hydra_redis.collections_endpoint import CollectionEndpoints
-from hydra_redis.classes_objects import ClassEndpoints,RequestError
-from hydra_redis.redis_proxy import RedisProxy
+from hydra_agent.collections_endpoint import CollectionEndpoints
+from hydra_agent.classes_objects import ClassEndpoints,RequestError
+from hydra_agent.redis_proxy import RedisProxy
 
 logging.basicConfig(level=logging.INFO)
 logger = logging.getLogger(__name__)

hydra_redis/hydra_graph.py hydra_agent/hydra_graph.pyhydra_redis/hydra_graph.py renamed to hydra_agent/hydra_graph.py

@@ -0,0 +1,107 @@
+import unittest
+import urllib.request
+import json
+import redis
+from hydrus.hydraspec import doc_maker
+from os import sys, path
+from hydra_agent import querying_mechanism
+
+class TestQueryingMechanism(unittest.TestCase):
+
+    def setUp(self):
+        url = "https://storage.googleapis.com/api4/api"
+        vocab_url = url + "/" + "vocab"
+        response = urllib.request.urlopen(vocab_url)
+        apidoc = json.loads(response.read().decode('utf-8'))
+        api_doc = doc_maker.create_doc(apidoc)
+        self.query_facades = querying_mechanism.QueryFacades(api_doc, url, True)
+        self.query_facades.initialize(True)
+        self.test_database = redis.StrictRedis(host='localhost', port=6379, db=5)
+
+    def test_1_classendpoint(self):
+        """Test for class endpoint"""
+        check_data = [['p.properties', 'p.id', 'p.type'],
+                      ["['Location']",'vocab:EntryPoint/Location','Location']]
+        query = "show classEndpoints"
+        data = self.query_facades.user_query(query)
+        for check in check_data:
+            flag = False
+            if check[0] in str(data) and check[1] in str(data) and check[2] in str(data):
+                flag = True
+        if flag:
+            self.assertTrue(True)
+        else:
+            self.assertTrue(False)
+
+    def test_2_collectionendpoint(self):
+        """Test for collection endpoint"""
+        check_data = ["ControllerLogCollection",
+                      "DroneLogCollection",
+                      "AnomalyCollection",
+                      "DroneCollection",
+                      "CommandCollection",
+                      "HttpApiLogCollection",
+                      "DatastreamCollection",
+                      "MessageCollection"]
+        query = "show collectionEndpoints"
+        data = self.query_facades.user_query(query)
+        for check in check_data:
+            if check not in str(data):
+                self.assertTrue(False)
+        self.assertTrue(True)
+
+    def test_3_CommandCollectionmember(self):
+        """
+        Test for all Commands in CommandCollection.
+        Data is already stored in check_data from the static data url.
+        Check_data is used for compare the data retrieve by querying process.
+        """
+        check_data = ['[]']
+        query = "show CommandCollection members"
+        data = self.query_facades.user_query(query)
+        self.assertEqual(data[1],check_data)
+
+    def test_4_ControllerLogCollectionmember(self):
+        """
+        Test for all controller logs for ControllerLogCollection.
+        Whole object of ControllerLogCollection is stored in check data.
+        Check_data is used for compare the data retrieve by querying process.
+        """
+        check_data = [{'@id': '/api/ControllerLogCollection/65',
+                       '@type': 'ControllerLog'},
+                      {'@id': '/api/ControllerLogCollection/183',
+                       '@type': 'ControllerLog'},
+                      {'@id': '/api/ControllerLogCollection/374',
+                       '@type': 'ControllerLog'}]
+        query = "show ControllerLogCollection members"
+        data = self.query_facades.user_query(query)
+        # Make data searchable and comaprable.
+        data1 = str(data[1]).replace('"', '')
+        # data retrive from the memory can be distributed:
+        # like type can be at first position and id can be at second.
+        # So, check_data split in 3 parts.
+        # And check all parts are in data retrieve.
+        if str(
+            check_data[0]) in data1 and str(
+            check_data[1]) in data1 and str(
+                check_data[2]) in data1:
+            self.assertTrue(True)
+        else:
+            self.assertTrue(False)
+        
+
+    def test_5_DatastreamCollectionmember(self):
+        """Test for all datastream with Drone ID 2"""
+        check_data = ['/api/DatastreamCollection/19']
+        query = "show DatastreamCollection members"
+        data = self.query_facades.user_query(query)
+        # Here are find the datastream only for those which have DroneID 2.
+        query = "show DroneID 2 and type Datastream"
+        data = self.query_facades.user_query(query)
+        self.assertEqual(data,check_data)
+
+    def tearDown(self):
+        self.test_database.flushdb()
+
+if __name__ == "__main__":
+    unittest.main()

hydra_redis/querying_mechanism.py hydra_agent/querying_mechanism.pyhydra_redis/querying_mechanism.py renamed to hydra_agent/querying_mechanism.py

@@ -0,0 +1,114 @@
+import unittest
+import redis
+
+
+class Tests:
+    def entry_point(self):
+        """Test for testing the data stored in entrypoint endpoint"""
+
+        print("entrypoint db=0")
+        r = redis.StrictRedis(host='localhost', port=6379, db=0)
+        reply = r.execute_command('GRAPH.QUERY',
+                                  'apidoc', "MATCH (p:id) RETURN p")
+        property_list = []
+        flag = 0
+        for objects in reply:
+            for obj in objects:
+                if flag == 0:
+                    string = obj.decode('utf-8')
+                    map_string = map(str.strip, string.split(','))
+                    property_list = list(map_string)
+                    check = property_list.pop()
+                    property_list.append(check.replace("\x00", ""))
+                    print(property_list)
+                    flag += 1
+                    break
+        if ("p.id" in property_list and
+                "p.url" in property_list and
+                "p.supportedOperation" in property_list):
+            return True
+        else:
+            return False
+
+    def collection_endpoints(self):
+        """Test for testing the data stored in collection endpoints"""
+
+        print("collection endpoints db=0")
+        r = redis.StrictRedis(host='localhost', port=6379, db=0)
+        reply = r.execute_command('GRAPH.QUERY',
+                                  'apidoc', "MATCH (p:collection) RETURN p")
+        property_list = []
+        flag = 0
+        for objects in reply:
+            for obj in objects:
+                if flag == 0:
+                    string = obj.decode('utf-8')
+                    map_string = map(str.strip, string.split(','))
+                    property_list = list(map_string)
+                    check = property_list.pop()
+                    property_list.append(check.replace("\x00", ""))
+                    print(property_list)
+                    flag += 1
+                    break
+        if ("p.id" in property_list and
+                "p.operations" in property_list and
+                "p.members" in property_list):
+            return True
+        else:
+            return False
+
+    def class_endpoints(self):
+        """Test for testing the data stored in classes endpoints"""
+
+        print("class endpoints db=0")
+        r = redis.StrictRedis(host='localhost', port=6379, db=0)
+        reply = r.execute_command('GRAPH.QUERY',
+                                  'apidoc', "MATCH (p:classes) RETURN p")
+        property_list = []
+        flag = 0
+        for objects in reply:
+            for obj in objects:
+                if flag == 0:
+                    string = obj.decode('utf-8')
+                    map_string = map(str.strip, string.split(','))
+                    property_list = list(map_string)
+                    check = property_list.pop()
+                    property_list.append(check.replace("\x00", ""))
+                    print(property_list)
+                    flag += 1
+                    break
+        if ("p.id" in property_list and
+                "p.operations" in property_list and
+                "p.properties" in property_list and
+                "p.type" in property_list):
+            return True
+        else:
+            return False
+
+
+class TestRedisStructure(unittest.TestCase):
+    test_redis = Tests()
+
+    @classmethod
+    def setUpClass(cls):
+        cls.test_database=redis.StrictRedis(host='localhost', port=6379, db=5)
+        cls.test_database.set("foo","bar")
+        cls.test_database.set("hydra","redis")
+        print("setUpClass db=5 keys:",cls.test_database.keys())
+
+    def test_entrypoint(self):
+        self.assertTrue(self.test_redis.entry_point())
+
+    def test_collectionEndpoints(self):
+        self.assertTrue(self.test_redis.collection_endpoints())
+
+    def test_classEndpoints(self):
+        self.assertTrue(self.test_redis.class_endpoints())
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.test_database.flushdb()
+        print("tearDownClass db=5 keys:",cls.test_database.get("foo"))
+
+if __name__ == '__main__':
+    unittest.main()

hydra_redis/redis_proxy.py hydra_agent/redis_proxy.pyhydra_redis/redis_proxy.py renamed to hydra_agent/redis_proxy.py

@@ -25,6 +25,6 @@
       install_requires=dependencies,
       packages=find_packages(
           exclude=['hydra','examples','test*','python_whihydra_agent.egg-info']),
-      package_dir={'hydra_redis':
-                   'hydra_redis'},
+      package_dir={'hydra_agent':
+                   'hydra_agent'},
       )