#1602 got objectFilter kinda working, at least for simple things. Need to figure out how to deal with href entries though

Author: allmightyspiff

SoftLayer/transports/soap.py

@@ -40,6 +40,7 @@ def __init__(self, endpoint_url=None, timeout=None, proxy=None, user_agent=None,
         self.verify = verify
         self._client = None
         self.history = HistoryPlugin()
+        self.soapNS = "http://api.service.softlayer.com/soap/v3.1/"
 
     def __call__(self, request):
         """Makes a SoftLayer API call against the SOAP endpoint.
@@ -55,29 +56,49 @@ def __call__(self, request):
         # MUST define headers like this because otherwise the objectMask header doesn't work
         # because it isn't sent in with a namespace.
         xsdUserAuth = xsd.Element(
-            '{http://api.softlayer.com/soap/v3/}authenticate',
+            f"{{{self.soapNS}}}authenticate",
             xsd.ComplexType([
-                xsd.Element('{http://api.service.softlayer.com/soap/v3/}username', xsd.String()),
-                xsd.Element('{http://api.service.softlayer.com/soap/v3/}apiKey', xsd.String())
+                xsd.Element(f'{{{self.soapNS}}}username', xsd.String()),
+                xsd.Element(f'{{{self.soapNS}}}apiKey', xsd.String())
             ])
         )
+        factory = client.type_factory(f"{self.soapNS}")
+        theMask = client.get_type(f"{{{self.soapNS}}}SoftLayer_ObjectMask")
         xsdMask = xsd.Element(
             '{http://api.service.softlayer.com/soap/v3.1/}SoftLayer_ObjectMask',
+            factory['SoftLayer_ObjectMask']
+        )
+
+        # Object Filter
+        filterType = client.get_type(f"{{{self.soapNS}}}{request.service}ObjectFilter")
+        xsdFilter = xsd.Element(
+            f"{{{self.soapNS}}}{request.service}ObjectFilter", filterType
+        )
+
+        # Result Limit
+        xsdResultLimit = xsd.Element(
+            f"{{{self.soapNS}}}resultLimit",
             xsd.ComplexType([
-                xsd.Element('mask', xsd.String()),
+                xsd.Element('limit', xsd.String()),
+                xsd.Element('offset', xsd.String()),
             ])
         )
 
+        test = {"type":{"keyName":{"operation":"BARE_METAL_CPU"}} }
         headers = [
             xsdMask(mask=request.mask or ''),
-            xsdUserAuth(username=request.transport_user, apiKey=request.transport_password)
+            xsdUserAuth(username=request.transport_user, apiKey=request.transport_password),
+            xsdResultLimit(limit=2, offset=0),
+            xsdFilter(**request.filter or '') # The ** here forces python to treat this dict as properties
         ]
 
         pp(headers)
         print("HEADERS ^^^^^")
         method = getattr(client.service, request.method)
-        result = client.service.getObject(_soapheaders=headers)
-        return serialize_object(result)
+
+        # result = client.service.getObject(_soapheaders=headers)
+        result = method(_soapheaders=headers)
+        return serialize_object(result['body']['getAllObjectsReturn'])
         # result = transport.post(f"{self.endpoint_url}/{request.service}")
 
 

tests/transports/soap_tests.py

@@ -78,3 +78,15 @@ def test_objectMask(self):
         self.assertIsNone(data.get('address1'))
         self.assertEqual(data.get('id'), 307608)
 
+    def test_objectFilter(self):
+        self.request.service = "SoftLayer_Product_Package"
+        self.request.method = "getAllObjects"
+        self.request.mask = "mask[id,description,keyName,type[id,keyName],name]"
+        self.request.filter = {'type': {'keyName': {'operation': 'BARE_METAL_CPU'}}}
+        data = self.transport(self.request)
+        # pp(data)
+        # print("^^^ DATA **** ")
+        for package in data:
+            pp(package)
+            print("^^^ PACKAGE **** ")
+            self.assertEqual(package.get('type').get('keyName'), "BARE_METAL_CPU")