Skip to content

Commit 535c80e

Browse files
radzhomeradzhome
authored
Merge pull request #102 from istvanbolya/update_wsdls
[task] Update WSDLs and related services
2 parents 6d7b47d + e4a8721 commit 535c80e

23 files changed

+7832
-8134
lines changed

‎fedex/services/availability_commitment_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def __init__(self, config_obj, *args, **kwargs):
2626
# Holds version info for the VersionId SOAP object.
2727
self._version_info = {
2828
'service_id': 'vacs',
29-
'major': '4',
29+
'major': '8',
3030
'intermediate': '0',
3131
'minor': '0'
3232
}
@@ -58,7 +58,7 @@ def __init__(self, config_obj, *args, **kwargs):
5858
# Exception: binding 'ns:ValidationAvailabilityAndCommitmentServiceSoapBinding', not-found
5959

6060
super(FedexAvailabilityCommitmentRequest, self).__init__(
61-
self._config_obj, 'AvailabilityAndCommitmentService_v4.wsdl', *args, **kwargs)
61+
self._config_obj, 'ValidationAvailabilityAndCommitmentService_v8.wsdl', *args, **kwargs)
6262

6363
def _prepare_wsdl_objects(self):
6464
"""

‎fedex/services/country_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __init__(self, config_obj, *args, **kwargs):
2727
# Holds version info for the VersionId SOAP object.
2828
self._version_info = {
2929
'service_id': 'cnty',
30-
'major': '4',
30+
'major': '8',
3131
'intermediate': '0',
3232
'minor': '0'
3333
}
@@ -48,7 +48,7 @@ def __init__(self, config_obj, *args, **kwargs):
4848
"""@ivar: Holds the CheckForMismatch boolean objects."""
4949

5050
super(FedexValidatePostalRequest, self).__init__(
51-
self._config_obj, 'CountryService_v4.wsdl', *args, **kwargs)
51+
self._config_obj, 'CountryService_v8.wsdl', *args, **kwargs)
5252

5353
def _prepare_wsdl_objects(self):
5454
"""

‎fedex/services/location_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def __init__(self, config_obj, *args, **kwargs):
2828
# Holds version info for the VersionId SOAP object.
2929
self._version_info = {
3030
'service_id': 'locs',
31-
'major': '3',
31+
'major': '9',
3232
'intermediate': '0',
3333
'minor': '0'
3434
}
@@ -53,7 +53,7 @@ def __init__(self, config_obj, *args, **kwargs):
5353
"""@ivar: Holds the LocationSortDetail WSDL object."""
5454

5555
super(FedexSearchLocationRequest, self).__init__(
56-
self._config_obj, 'LocationsService_v3.wsdl', *args, **kwargs)
56+
self._config_obj, 'LocationsService_v9.wsdl', *args, **kwargs)
5757

5858
def _prepare_wsdl_objects(self):
5959
"""

‎fedex/services/pickup_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def __init__(self, config_obj, *args, **kwargs):
88
# Holds version info for the VersionId SOAP object.
99
self._version_info = {
1010
'service_id': 'disp',
11-
'major': '11',
11+
'major': '17',
1212
'intermediate': '0',
1313
'minor': '0'
1414
}
@@ -21,7 +21,7 @@ def __init__(self, config_obj, *args, **kwargs):
2121
self.CommodityDescription = None
2222
self.CountryRelationship = None
2323
self.PickupServiceCategory = None
24-
super(FedexCreatePickupRequest, self).__init__(self._config_obj, 'PickupService_v11.wsdl', *args, **kwargs)
24+
super(FedexCreatePickupRequest, self).__init__(self._config_obj, 'PickupService_v17.wsdl', *args, **kwargs)
2525

2626
def _prepare_wsdl_objects(self):
2727
self.OriginDetail = self.client.factory.create('PickupOriginDetail')

‎fedex/services/rate_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ def __init__(self, config_obj, *args, **kwargs):
2929
self._config_obj = config_obj
3030

3131
# Holds version info for the VersionId SOAP object.
32-
self._version_info = {'service_id': 'crs', 'major': '18',
32+
self._version_info = {'service_id': 'crs', 'major': '24',
3333
'intermediate': '0', 'minor': '0'}
3434

3535
self.RequestedShipment = None
3636
"""@ivar: Holds the RequestedShipment WSDL object including the shipper, recipient and shipt time."""
3737
# Call the parent FedexBaseService class for basic setup work.
3838
super(FedexRateServiceRequest, self).__init__(
39-
self._config_obj, 'RateService_v18.wsdl', *args, **kwargs)
39+
self._config_obj, 'RateService_v24.wsdl', *args, **kwargs)
4040
self.ClientDetail.Region = config_obj.express_region_code
4141
"""@ivar: Holds the express region code from the config object."""
4242

‎fedex/services/ship_service.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ def __init__(self, config_obj, *args, **kwargs):
3131
# Holds version info for the VersionId SOAP object.
3232
self._version_info = {
3333
'service_id': 'ship',
34-
'major': '17',
34+
'major': '23',
3535
'intermediate': '0',
3636
'minor': '0'
3737
}
3838
self.RequestedShipment = None
3939
"""@ivar: Holds the RequestedShipment WSDL object."""
4040
# Call the parent FedexBaseService class for basic setup work.
4141
super(FedexProcessShipmentRequest, self).__init__(
42-
self._config_obj, 'ShipService_v17.wsdl', *args, **kwargs)
42+
self._config_obj, 'ShipService_v23.wsdl', *args, **kwargs)
4343

4444
def _prepare_wsdl_objects(self):
4545
"""
@@ -177,15 +177,15 @@ def __init__(self, config_obj, *args, **kwargs):
177177
self._config_obj = config_obj
178178

179179
# Holds version info for the VersionId SOAP object.
180-
self._version_info = {'service_id': 'ship', 'major': '17',
180+
self._version_info = {'service_id': 'ship', 'major': '23',
181181
'intermediate': '0', 'minor': '0'}
182182
self.DeletionControlType = None
183183
"""@ivar: Holds the DeletrionControlType WSDL object."""
184184
self.TrackingId = None
185185
"""@ivar: Holds the TrackingId WSDL object."""
186186
# Call the parent FedexBaseService class for basic setup work.
187187
super(FedexDeleteShipmentRequest, self).__init__(self._config_obj,
188-
'ShipService_v17.wsdl',
188+
'ShipService_v23.wsdl',
189189
*args, **kwargs)
190190

191191
def _prepare_wsdl_objects(self):

‎fedex/services/track_service.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def __init__(self, config_obj, *args, **kwargs):
4141
# Holds version info for the VersionId SOAP object.
4242
self._version_info = {
4343
'service_id': 'trck',
44-
'major': '10',
44+
'major': '16',
4545
'intermediate': '0',
4646
'minor': '0'
4747
}
@@ -54,7 +54,7 @@ def __init__(self, config_obj, *args, **kwargs):
5454

5555
# Call the parent FedexBaseService class for basic setup work.
5656
super(FedexTrackRequest, self).__init__(
57-
self._config_obj, 'TrackService_v10.wsdl', *args, **kwargs)
57+
self._config_obj, 'TrackService_v16.wsdl', *args, **kwargs)
5858
self.IncludeDetailedScans = False
5959

6060
def _prepare_wsdl_objects(self):

fedex/wsdl/CountryService_v4.wsdl renamed to fedex/wsdl/CountryService_v8.wsdl

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/cnty/v4" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/cnty/v4" name="CountryServiceDefinitions">
1+
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:ns="http://fedex.com/ws/cnty/v8" xmlns:s1="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="http://fedex.com/ws/cnty/v8" name="CountryServiceDefinitions">
22
<types>
3-
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/cnty/v4">
3+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://fedex.com/ws/cnty/v8">
44
<xs:element name="ValidatePostalReply" type="ns:ValidatePostalReply"/>
55
<xs:element name="ValidatePostalRequest" type="ns:ValidatePostalRequest"/>
66
<xs:complexType name="Address">
@@ -48,6 +48,11 @@
4848
<xs:documentation>Indicates whether this address residential (as opposed to commercial).</xs:documentation>
4949
</xs:annotation>
5050
</xs:element>
51+
<xs:element name="GeographicCoordinates" type="xs:string" minOccurs="0">
52+
<xs:annotation>
53+
<xs:documentation>The geographic coordinates cooresponding to this address.</xs:documentation>
54+
</xs:annotation>
55+
</xs:element>
5156
</xs:sequence>
5257
</xs:complexType>
5358
<xs:simpleType name="CarrierCodeType">
@@ -179,7 +184,7 @@
179184
</xs:element>
180185
<xs:element name="MessageParameters" type="ns:NotificationParameter" minOccurs="0" maxOccurs="unbounded">
181186
<xs:annotation>
182-
<xs:documentation>A collection of name/value pairs that provide specific data to help the client determine the nature of an error (or warning, etc.) witout having to parse the message string.</xs:documentation>
187+
<xs:documentation>A collection of name/value pairs that provide specific data to help the client determine the nature of an error (or warning, etc.) without having to parse the message string.</xs:documentation>
183188
</xs:annotation>
184189
</xs:element>
185190
</xs:sequence>
@@ -222,6 +227,7 @@
222227
</xs:simpleType>
223228
<xs:complexType name="PostalDetail">
224229
<xs:sequence>
230+
<xs:element name="CountryCode" type="xs:string" minOccurs="0"/>
225231
<xs:element name="StateOrProvinceCode" type="xs:string" minOccurs="0"/>
226232
<xs:element name="CityFirstInitials" type="xs:string" minOccurs="0"/>
227233
<xs:element name="CleanedPostalCode" type="xs:string" minOccurs="0"/>
@@ -245,7 +251,8 @@
245251
<xs:enumeration value="DRY_ICE"/>
246252
<xs:enumeration value="EAST_COAST_SPECIAL"/>
247253
<xs:enumeration value="ELECTRONIC_TRADE_DOCUMENTS"/>
248-
<xs:enumeration value="EMAIL_NOTIFICATION"/>
254+
<xs:enumeration value="EVENT_NOTIFICATION"/>
255+
<xs:enumeration value="EXCLUDE_FROM_CONSOLIDATION"/>
249256
<xs:enumeration value="EXCLUSIVE_USE"/>
250257
<xs:enumeration value="EXHIBITION_DELIVERY"/>
251258
<xs:enumeration value="EXHIBITION_PICKUP"/>
@@ -276,6 +283,7 @@
276283
<xs:enumeration value="LIMITED_ACCESS_PICKUP"/>
277284
<xs:enumeration value="MARKING_OR_TAGGING"/>
278285
<xs:enumeration value="NON_BUSINESS_TIME"/>
286+
<xs:enumeration value="OVER_LENGTH"/>
279287
<xs:enumeration value="PALLETS_PROVIDED"/>
280288
<xs:enumeration value="PALLET_SHRINKWRAP"/>
281289
<xs:enumeration value="PALLET_WEIGHT_ALLOWANCE"/>
@@ -394,7 +402,7 @@
394402
<xs:documentation>Identifies a system or sub-system which performs an operation.</xs:documentation>
395403
</xs:annotation>
396404
</xs:element>
397-
<xs:element name="Major" type="xs:int" fixed="4" minOccurs="1">
405+
<xs:element name="Major" type="xs:int" fixed="8" minOccurs="1">
398406
<xs:annotation>
399407
<xs:documentation>Identifies the service business level.</xs:documentation>
400408
</xs:annotation>
@@ -428,7 +436,7 @@
428436
<binding name="CountryServiceSoapBinding" type="ns:CountryPortType">
429437
<s1:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
430438
<operation name="validatePostal">
431-
<s1:operation soapAction="http://fedex.com/ws/cnty/v4/validatePostal" style="document"/>
439+
<s1:operation soapAction="http://fedex.com/ws/cnty/v8/validatePostal" style="document"/>
432440
<input>
433441
<s1:body use="literal"/>
434442
</input>
@@ -439,7 +447,7 @@
439447
</binding>
440448
<service name="CountryService">
441449
<port name="CountryServicePort" binding="ns:CountryServiceSoapBinding">
442-
<s1:address location="https://beta.fedex.com:443/web-services/cnty"/>
450+
<s1:address location="https://ws.fedex.com:443/web-services/cnty"/>
443451
</port>
444452
</service>
445453
</definitions>

0 commit comments

Comments
 (0)