service: do not search for Ass. Sets in own namespace

The implementation of navigation properties expected that the
corresponding Association and the corresponding AssociationSet must be
both in the same namespace but that is not true. See:

  https://services.odata.org/V2/Northwind/Northwind.svc/$metadata

Reported by FedorSelitsky <[email protected]> in the PR #14.

Author: filak-sap

pyodata/v2/service.py

@@ -994,13 +994,12 @@ def nav(self, nav_property, key):
         # Get entity set of navigation property
         association_info = navigation_property.association_info
         association_set = self._service.schema.association_set_by_association(
-            association_info.name,
-            association_info.namespace)
+            association_info.name)
 
         navigation_entity_set = None
         for entity_set in association_set.end_roles:
             if association_set.end_roles[entity_set] == navigation_property.to_role.role:
-                navigation_entity_set = self._service.schema.entity_set(entity_set, association_info.namespace)
+                navigation_entity_set = self._service.schema.entity_set(entity_set)
 
         if not navigation_entity_set:
             raise PyODataException('No association set for role {}'.format(navigation_property.to_role))

tests/conftest.py

@@ -72,6 +72,23 @@ def metadata():
             <Property Name="CarName" Type="Edm.String" Nullable="false" sap:unicode="false" sap:label="Data" sap:creatable="false" sap:updatable="false" sap:sortable="true" sap:filterable="true"/>
             <Property Name="Content" Type="Edm.Binary" Nullable="false" sap:label="Picture" sap:creatable="false" sap:updatable="false" sap:sortable="false" sap:filterable="false"/>
            </EntityType>
+
+           <EntityType Name="Customer">
+            <Key>
+             <PropertyRef Name="Name"/>
+            </Key>
+            <Property Name="Name" Type="Edm.String" Nullable="false" />
+            <NavigationProperty Name="Orders" Relationship="EXAMPLE_SRV.CustomerOrders" FromRole="CustomerRole" ToRole="OrdersRole"/>
+           </EntityType>
+
+           <EntityType Name="Order">
+            <Key>
+             <PropertyRef Name="Number"/>
+            </Key>
+            <Property Name="Number" Type="Edm.String" Nullable="false" />
+            <Property Name="Owner" Type="Edm.String" Nullable="false" />
+           </EntityType>
+
            <ComplexType Name="ComplexNumber">
             <Property Name="Real" Type="Edm.Double" Nullable="false"/>
             <Property Name="Imaginary" Type="Edm.Double" Nullable="false"/>
@@ -111,6 +128,20 @@ def metadata():
              </Dependent>
             </ReferentialConstraint>
            </Association>
+
+           <Association Name="CustomerOrders">
+            <End Role="CustomerRole" Type="EXAMPLE_SRV.Customer" Multiplicity="1"/>
+            <End Role="OrdersRole" Type="EXAMPLE_SRV.Order" Multiplicity="*"/>
+            <ReferentialConstraint>
+             <Principal Role="CustomerRole">
+              <PropertyRef Name="Name"/>
+             </Principal>
+             <Dependent Role="OrdersRole">
+              <PropertyRef Name="Owner"/>
+             </Dependent>
+            </ReferentialConstraint>
+           </Association>
+
            <EntityContainer Name="EXAMPLE_SRV" m:IsDefaultEntityContainer="true" sap:supported-formats="atom json xlsx">
             <EntitySet Name="MasterEntities" EntityType="EXAMPLE_SRV.MasterEntity" sap:label="Master entities" sap:creatable="false" sap:updatable="false" sap:deletable="false" sap:searchable="true" sap:content-version="1"/>
             <EntitySet Name="DataValueHelp" EntityType="EXAMPLE_SRV.DataEntity" sap:creatable="false" sap:updatable="false" sap:deletable="false" sap:searchable="true" sap:content-version="1"/>
@@ -237,6 +268,10 @@ def metadata():
 
                 <EntitySet Name="Addresses" EntityType="Address"/>
 
+                <EntitySet Name="Customers" EntityType="EXAMPLE_SRV.Customer"/>
+
+                <EntitySet Name="Orders" EntityType="EXAMPLE_SRV.Order"/>
+
                 <FunctionImport Name="get_max" ReturnType="TemperatureMeasurement" EntitySet="TemperatureMeasurements" m:HttpMethod="GET" />
 
                 <FunctionImport Name="get_best_measurements" ReturnType="Collection(EXAMPLE_SRV.TemperatureMeasurement)" EntitySet="EXAMPLE_SRV.TemperatureMeasurements" m:HttpMethod="GET" />
@@ -256,6 +291,11 @@ def metadata():
                     <End Role="AddressRole" EntitySet="Addresses"/>
                 </AssociationSet>
 
+                <AssociationSet Name="CustomerOrder_AssocSet" Association="EXAMPLE_SRV.CustomerOrders">
+                    <End Role="CustomerRole" EntitySet="Customers"/>
+                    <End Role="OrdersRole" EntitySet="Orders"/>
+                </AssociationSet>
+
             </EntityContainer>
 
           </Schema>

tests/test_model_v2.py

@@ -24,7 +24,9 @@ def test_edmx(schema):
         'City',
         'TemperatureMeasurement',
         'Car',
-        'CarIDPic'
+        'CarIDPic',
+        'Customer',
+        'Order'
     }
 
     assert set((entity_set.name for entity_set in schema.entity_sets)) == {
@@ -37,7 +39,9 @@ def test_edmx(schema):
         'CitiesWithFilter',
         'TemperatureMeasurements',
         'Cars',
-        'CarIDPics'
+        'CarIDPics',
+        'Customers',
+        'Orders'
     }
 
     master_entity = schema.entity_type('MasterEntity')
@@ -161,6 +165,7 @@ def test_edmx_associations(schema):
 
     assert set((association.name for association in schema.associations)) == {'toCarIDPic',
                                                                               'toDataEntity',
+                                                                              'CustomerOrders',
                                                                               'AssociationEmployeeAddress'}
 
     association = schema.association('toDataEntity')
@@ -184,6 +189,7 @@ def test_edmx_associations(schema):
 
     assert set((association_set.name for association_set in schema.association_sets)) == {'toDataEntitySet',
                                                                                           'AssociationEmployeeAddress_AssocSet',
+                                                                                          'CustomerOrder_AssocSet',
                                                                                           'toCarIDPicSet'}
     association_set = schema.association_set('toDataEntitySet')
     assert str(association_set) == 'AssociationSet(toDataEntitySet)'

tests/test_service_v2.py

@@ -533,6 +533,35 @@ def test_navigation_1on1_get_value_without_proxy(service):
     assert stream.content == b'DEADBEAF'
 
 
+@responses.activate
+def test_navigation_when_nes_in_another_ns(service):
+    """Check whether it is possible to navigate when AssociationSet is defined
+       in a different namespace.
+   """
+
+    # pylint: disable=redefined-outer-name
+
+    responses.add(
+        responses.GET,
+        "{0}/Customers('Mammon')/Orders".format(service.url),
+        json={'d': {'results' : [{
+            'Number': '456',
+            'Owner': 'Mammon',
+        }]}},
+        status=200)
+
+    request = service.entity_sets.Customers.get_entity('Mammon').nav('Orders').get_entities()
+
+    assert isinstance(request, pyodata.v2.service.GetEntitySetRequest)
+
+    orders = request.execute()
+
+    assert len(orders) == 1
+
+    assert orders[0].Number == '456'
+    assert orders[0].Owner == 'Mammon'
+
+
 @responses.activate
 def test_entity_get_value_1on1_with_proxy(service):
     """Check getting $value"""