Commit 7497201e authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in MEC 013 for user subscriptions; Change record of into set of to use superset

parent fbae3c52

etc/AtsMec_Location/AtsMec_Location_Sandbox.cf_

+11 −1
Original line number Diff line number Diff line
@@ -77,7 +77,17 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec_mec013)/TCP(debug=1 
#AtsMec_TestControl.control



# Check that the IUT responds with a list for the location of User Equipments when queried by a MEC Application

AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_001_OK

#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_001_OK

# Check that the IUT responds with the subscription when queried by a MEC Application - UE location Event

#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_002_OK_01

# Check that the IUT responds with the subscription when queried by a MEC Application - UE location Periodic

#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_002_OK_02

# Check that the IUT responds with the subscription when queried by a MEC Application - UE location Event and address

#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_002_OK_03

# Check that the IUT responds with an error when inconsistent request was sent by a MEC Application - Invalid filter

AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_002_BR





# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_LocationAPI_TestCases.TC_MEC_MEC013_SRV_UELOCLOOK_001_BR

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

titan-test-system-framework @ c579f7c7

Original line number Diff line number Diff line 
Subproject commit d2fa28595526041b73cd876a6130bfba4ad9e5af
 
Subproject commit c579f7c7175b34426e8392e1edd3885c4b9cd185

ttcn/AtsMec_Location/AtsMec_LocationAPI_TestCases.ttcn

+86 −88

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/LibMec/ApplicationMobilityServiceAPI/ttcn/ApplicationMobilityServiceAPI_TypesAndValues.ttcn

+8 −8
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    DeviceInformation  deviceInformation optional,

    Json.UInteger      expiryTime optional

  }

  type record of RegistrationInfo RegistrationInfos;

  type set of RegistrationInfo RegistrationInfos;



  /**

   * @desc The identifier of service consumer requesting the Application Mobility Service
@@ -42,7 +42,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    Json.String appInstanceId optional,

    Json.String mepId optional

  }

  type record of ServiceConsumerId ServiceConsumerIds;

  type set of ServiceConsumerId ServiceConsumerIds;



  /**

   * @desc Specifies the device served by the application instance which is registering the Application Mobility Service
@@ -56,7 +56,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    AppMobilityServiceLevel appMobilityServiceLevel optional,

    ContextTransferState    contextTransferState optional

  }

  type record of DeviceInformation_ DeviceInformation;

  type set of DeviceInformation_ DeviceInformation;



  /**

   * @desc Represents the state of transferring the user context to another application instance
@@ -85,7 +85,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    MECHostInformation     mecHostInformation optional,

    Json.String            registeredInstanceId optional

  }

  type record of AdjacentAppInstanceInfo AdjacentAppInstanceInfos;

  type set of AdjacentAppInstanceInfo AdjacentAppInstanceInfos;



  /**

   * @desc This type represents a subscription to mobility procedure notifications from AMS
@@ -109,7 +109,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
  } with {

    variant (links) "name as '_links'";

  }

  type record of MobilityProcedureSubscription MobilityProcedureSubscriptions;

  type set of MobilityProcedureSubscription MobilityProcedureSubscriptions;



  /**

   * @desc Hyperlink related to the resource
@@ -133,7 +133,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    AssociateId        associateId optional,

    MobilityStatus	   mobilityStatus optional

  }

  type record of FilterCriteria FilterCriterias;

  type set of FilterCriteria FilterCriterias;



  /**

   * @desc This type represents a subscription to notification about the change on adjacent application instance information from AMS
@@ -157,7 +157,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
  } with {

    variant (links) "name as '_links'";

  }

  type record of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions;

  type set of AdjacentAppInfoSubscription AdjacentAppInfoSubscriptions;



  /**

   * @desc List of filtering criteria for the subscription
@@ -253,7 +253,7 @@ module ApplicationMobilityServiceAPI_TypesAndValues { 
    variant (links) "name as '_links'";

  }



  type record of TargetAppInfo AdjacentAppInfo;

  type set of TargetAppInfo AdjacentAppInfo;



  /**

   * @desc This data type represents a notification from AMS with regards to expiry of the existing subscription

ttcn/LibMec/ApplicationPackageLifecycleAndOperationGrantingAPI/ttcn/ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues.ttcn

+28 −28
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  type record SwImageDescriptor {

    // FIXME shall follow the definition in clause 7.1.6.5 of ETSI GS NFV‑IFA 001 [1], with the following consideration:

  }

  type record of SwImageDescriptor SwImageDescriptors;

  type set of SwImageDescriptor SwImageDescriptors;



  /**

   * @desc The VirtualStorageDescriptor data type describes the virtual storage required by a MEC application
@@ -136,7 +136,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  type record VirtualStorageDescriptor {

    // FIXME shall follow the definition in clause 7.1.9.4 of ETSI GS NFV‑IFA 011 [0], with the following consideration:

  }

  type record of VirtualStorageDescriptor VirtualStorageDescriptors;

  type set of VirtualStorageDescriptor VirtualStorageDescriptors;



  /**

   * @desc The AppExternalCpd data type supports the specification of MEC application requirements related to external connection point
@@ -149,7 +149,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    AdditionalServiceData               additionalServiceData optional

    // FIXME inherited attributes

  }

  type record of AppExternalCpd AppExternalCpds;

  type set of AppExternalCpd AppExternalCpds;



  type record VirtualNetworkInterfaceRequirement {

    // FIXME For the definition of the VirtualNetworkInterfaceRequirements, please refer to clause 7.1.6.6 of ETSI GS NFV-IFA 001 [1]. For the definition of Cpd, please refer to clause 7.1.6.3 of ETSI GS NFV-IFA 001 [1]
@@ -175,7 +175,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String         version,

    TransportsSupported transportsSupported optional

  }

  type record of ServiceDescriptor ServiceDescriptors;

  type set of ServiceDescriptor ServiceDescriptors;



  /**

   * @desc Indicates transports and serialization formats supported made available to the service-consuming application
@@ -198,7 +198,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String featureName,

    Json.String version

  }

  type record of FeatureDependency FeatureDependencies;

  type set of FeatureDependency FeatureDependencies;



  /**

   * @desc The TrafficRuleDescriptor data type describes traffic rules related to a MEC application
@@ -220,7 +220,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  } with {

    variant (action_) "name as 'action'";

  }

  type record of TrafficRuleDescriptor TrafficRuleDescriptors;

  type set of TrafficRuleDescriptor TrafficRuleDescriptors;



  /**

   * @desc Definition of filter type: per FLOW or PACKET
@@ -344,7 +344,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    IpAddress    ipAddress,

    Json.Integer ttl optional

  }

  type record of DNSRuleDescriptor DNSRuleDescriptors;

  type set of DNSRuleDescriptor DNSRuleDescriptors;



  /**

   * @desc The LatencyDescriptor data type describes latency requirements for a MEC application
@@ -389,7 +389,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    TransportDependency serTransportDependencies optional,

    Json.String         requestedPermissions optional

  }

  type record of ServiceDependency ServiceDependencies;

  type set of ServiceDependency ServiceDependencies;



  /**

   * @desc The TransportDependency data type supports the specification of requirements of a MEC application related to supported transport bindings (each being a combination of a transport with one or more serializers)
@@ -403,7 +403,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues.SerializerType      serializers,

    Labels              labels

  }

  type record of TransportDependency TransportDependencies;

  type set of TransportDependency TransportDependencies;



  type record length(1..infinity) of Json.String Labels;
@@ -474,7 +474,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  type record OsContainerDescriptor {

    // FIXME shall follow the definition in clause 7.1.6.2 of ETSI GS NFV‑IFA 001 [1].

  }

  type record of OsContainerDescriptor OsContainerDescriptors;

  type set of OsContainerDescriptor OsContainerDescriptors;



  /**

   * @desc The McioIdentificationData data type contains data needed to identify an MCIO when interworking with the CISM
@@ -520,7 +520,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.Integer caType,

    Json.String  caValue

  }

  type record of CivicAddressElement_ CivicAddressElement;

  type set of CivicAddressElement_ CivicAddressElement;



  type record Geometry {

    Json.String type_,
@@ -528,15 +528,15 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  } with {

    variant (type_) "name as 'type'";

  }

  type record of Json.Number Coordinate;

  type record of Coordinate Coordinates;

  type set of Json.Number Coordinate;

  type set of Coordinate Coordinates;

  type record Property {

    Json.String key,

    Json.String value_

    } with {

    variant (value_) "name as 'value'";

  }

  type record of Property Properties;

  type set of Property Properties;

  type record Polygon {

    Json.String type_,

    Geometry geometry,
@@ -602,7 +602,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  } with {

    variant (links) "name as '_links'";

  }

  type record of AppInstanceInfo AppInstanceInfoList;

  type set of AppInstanceInfo AppInstanceInfoList;



  type enumerated InstantiationState {

    INSTANTIATED     (0),
@@ -687,7 +687,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String appSoftVersion,

    AppDVersion appDVersion optional

  }

  type record of Json.String AppDVersion;

  type set of Json.String AppDVersion;



  type record length(1..infinity) of Version Versions;
@@ -867,7 +867,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    AppInstanceState              appInstanceState optional,

    AppInstanceSubscriptionFilter appInstanceSubscriptionFilter optional

  }

  type record of AppInstSubscriptionRequest AppInstSubscriptionRequestList;

  type set of AppInstSubscriptionRequest AppInstSubscriptionRequestList;



  /**

   * @desc This data type represents an application lifecycle management operation occurrence
@@ -895,7 +895,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  } with {

    variant (links) "name as '_links'";

  }

  type record of AppLcmOpOcc AppLcmOpOccList;

  type set of AppLcmOpOcc AppLcmOpOccList;



  /**

   * @desc Input parameters of the LCM operation
@@ -1034,7 +1034,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    KeyValuePairs extra optional

  }



  type record of VimConnectionInfo VimConnectionInfos;

  type set of VimConnectionInfo VimConnectionInfos;



  /**

   * @desc The data type represents a subscription link list of notification on application lifecycle management
@@ -1368,7 +1368,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  } with {

    variant (links) "name as '_links'";

  }

  type record of AppPkgInfo AppPkgInfoList;

  type set of AppPkgInfo AppPkgInfoList;



  type record AppPkgSWImageInfo_ {

    // FIXME The data type of application software image information data model is related to virtualisation method and needs for further study
@@ -1624,7 +1624,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    variant (type_) "name as 'type'";

  }



  type record of ResourceDefinition ResourceDefinitions;

  type set of ResourceDefinition ResourceDefinitions;



  type enumerated ResourceDefinition_Type {

    COMPUTE     (0),
@@ -1633,7 +1633,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    OSCONTAINER (3)

  }



  type record of Json.String ResourceTemplateId;

  type set of Json.String ResourceTemplateId;



  /**

   * @desc Resource information for an existing resource
@@ -1714,7 +1714,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String   resourceGroupId optional,

    KeyValuePairs mcioConstraints optional

  }

  type record of GrantInfo GrantInfos;

  type set of GrantInfo GrantInfos;



  /**

   * @desc This type provides information regarding a resource zone
@@ -1728,7 +1728,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String zoneId,

    Json.String vimConnectionId optional

  }

  type record of ZoneInfo ZoneInfos;

  type set of ZoneInfo ZoneInfos;



  /**

   * @desc This type provides information regarding a resource zone group
@@ -1738,8 +1738,8 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
  type record ZoneGroupInfo {

    ZoneIds zoneId

  }

  type record of ZoneGroupInfo ZoneGroupInfos;

  type record of Json.String ZoneIds;

  type set of ZoneGroupInfo ZoneGroupInfos;

  type set of Json.String ZoneIds;



  /**

   * @desc This type represents an external VL
@@ -1757,7 +1757,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    AppExtCpData     extCps,

    ExtLinkPortDatas extLinkPorts optional

  }

  type record of ExtVirtualLinkData ExtVirtualLinkDatas;

  type set of ExtVirtualLinkData ExtVirtualLinkDatas;



  /**

   * @desc This type represents an externally provided link port to be used to connect an external connection point to an external VL
@@ -1769,7 +1769,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_TypesAndValues { 
    Json.String    id,

    ResourceHandle resourceHandle

  }

  type record of ExtLinkPortData ExtLinkPortDatas;

  type set of ExtLinkPortData ExtLinkPortDatas;



  /**

   * @desc This type represents the information that allows addressing a virtualised resource that is used by an application instance