[LIB-837] correct SocketEndpoint behaviour (run mainly);

opalczynski · opalczynski · commit 515e50b83e58 · 2016-08-22T13:17:52.000+02:00
diff --git a/syncano/models/custom_sockets.py b/syncano/models/custom_sockets.py
@@ -59,7 +59,7 @@ def run(self, endpoint_name, method='GET', data=None):
     def _find_endpoint(self, endpoint_name):
         endpoints = self.get_endpoints()
         for endpoint in endpoints:
-            if endpoint_name == endpoint.name:
+            if '{}/{}'.format(self.name, endpoint_name) == endpoint.name:
                 return endpoint
         raise SyncanoValueError('Endpoint {} not found.'.format(endpoint_name))
 
@@ -127,14 +127,15 @@ class Meta:
 
     def run(self, method='GET', data=None):
         endpoint_path = self.links.self
+        _, endpoint_name = self.name.split('/', 1)
         connection = self._get_connection()
         if not self._validate_method(method):
             raise SyncanoValueError('Method: {} not specified in calls for this custom socket.'.format(method))
         method = method.lower()
         if method in ['get', 'delete']:
-            response = connection.request(method, endpoint_path)
+            response = connection.request(method, "{}/{}".format(endpoint_path, endpoint_name))
         elif method in ['post', 'put', 'patch']:
-            response = connection.request(method, endpoint_path, data=data or {})
+            response = connection.request(method, "{}/{}".format(endpoint_path, endpoint_name), data=data or {})
         else:
             raise SyncanoValueError('Method: {} not supported.'.format(method))
         return response
@@ -150,10 +151,6 @@ def get_all_endpoints(cls, instance_name=None):
         return [cls(**endpoint) for endpoint in response['objects']]
 
     def _validate_method(self, method):
-
-        methods = []
-        for call in self.calls:
-            methods.extend(call['methods'])
-        if '*' in methods or method in methods:
+        if '*' in self.allowed_methods or method in self.allowed_methods:
             return True
         return False
