Commit 78ed2cee authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

fix code bugs in MEC010-2 API

parent c597505c
Loading
Loading
Loading
Loading
+34 −15
Original line number Original line Diff line number Diff line
@@ -639,8 +639,9 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                                                                                               -,
                                                                                                                                               -,
                                                                                                                                               mw_checksum,
                                                                                                                                               mw_checksum,
                                                                                                                                               CREATED,
                                                                                                                                               CREATED,
                                                                                                                                               PX_OPERATIONAL_STATE,
                                                                                                                                               -,
                                                                                                                                               PX_USAGE_STATE
                                                                                                                                               PX_USAGE_STATE,
                                                                                                                                               -
                            )))))) -> value v_response {
                            )))))) -> value v_response {
          tc_ac.stop;
          tc_ac.stop;


@@ -753,11 +754,11 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                                                                          {
                                                                                                                          {
                                                                                                                            *,
                                                                                                                            *,
                                                                                                                            mw_app_pkg_info(
                                                                                                                            mw_app_pkg_info(
                                                                                                                                           -,
                                                                                                                                            v_app_pkg_info.id,
                                                                                                                                            mw_checksum,
                                                                                                                                            mw_checksum,
                                                                                                                                            PX_ONBOARDED_STATE,
                                                                                                                                            CREATED,
                                                                                                                                            PX_OPERATIONAL_STATE,
                                                                                                                                            -,
                                                                                                                                            PX_USAGE_STATE,
                                                                                                                                            -,
                                                                                                                                            -
                                                                                                                                            -
                                                                                                                                          ),
                                                                                                                                          ),
                                                                                                                            *
                                                                                                                            *
@@ -821,7 +822,8 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                                                                          {
                                                                                                                          {
                                                                                                                            *,
                                                                                                                            *,
                                                                                                                            mw_app_pkg_info_onboarded(
                                                                                                                            mw_app_pkg_info_onboarded(
                                                                                                                                              -, -,
                                                                                                                                              v_app_pkg_info.id,
                                                                                                                                              -,
                                                                                                                                              PX_APP_PKG_NAME,
                                                                                                                                              PX_APP_PKG_NAME,
                                                                                                                                              PX_APP_PKG_VERSION,
                                                                                                                                              PX_APP_PKG_VERSION,
                                                                                                                                              -, 
                                                                                                                                              -, 
@@ -938,7 +940,12 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                 mw_http_message_body_json(
                                                                 mw_http_message_body_json(
                                                                                           mw_body_json_app_pkg_info(
                                                                                           mw_body_json_app_pkg_info(
                                                                                                                     mw_app_pkg_info(
                                                                                                                     mw_app_pkg_info(
                                                                                                                                     v_app_pkg_info.id
                                                                                                                                     v_app_pkg_info.id,
                                                                                                                                     -,
                                                                                                                                     PX_ONBOARDED_STATE,
                                                                                                                                     -,
                                                                                                                                     PX_USAGE_STATE,
                                                                                                                                    v_app_pkg_info.links
                            )))))) -> value v_response {
                            )))))) -> value v_response {
          tc_ac.stop;
          tc_ac.stop;


@@ -996,11 +1003,22 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                 mw_http_message_body_json(
                                                                 mw_http_message_body_json(
                                                                                           mw_body_json_app_pkg_info(
                                                                                           mw_body_json_app_pkg_info(
                                                                                                                     mw_app_pkg_info_onboarded(
                                                                                                                     mw_app_pkg_info_onboarded(
                                                                                                                                     v_app_pkg_info.id
                                                                                                                                     v_app_pkg_info.id,
                                                                                                                                     v_app_pkg_info.appDId,
                                                                                                                                     v_app_pkg_info.appName,
                                                                                                                                     v_app_pkg_info.appSoftwareVersion,
                                                                                                                                     v_app_pkg_info.appDVersion,
                                                                                                                                     v_app_pkg_info.checksum, 
                                                                                                                                     -,
                                                                                                                                     PX_ONBOARDED_STATE_ONBOARDED,
                                                                                                                                     -, 
                                                                                                                                     -,
                                                                                                                                     v_app_pkg_info.mecInfo,
                                                                                                                                     v_app_pkg_info.links
                            )))))) -> value v_response {
                            )))))) -> value v_response {
          tc_ac.stop;
          tc_ac.stop;


          log("*** " & testcasename() & ": PASS: IUT successfully responds with an App Package ***");
          log("*** " & testcasename() & ": PASS: IUT successfully responds with an Onboarded App Package ***");
          f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
          f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
        }
        }
        [] tc_ac.timeout {
        [] tc_ac.timeout {
@@ -2213,7 +2231,7 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                                                                                           -,
                                                                                                                                           -,
                                                                                                                                            mw_checksum,
                                                                                                                                            mw_checksum,
                                                                                                                                            PX_ONBOARDED_STATE,
                                                                                                                                            PX_ONBOARDED_STATE,
                                                                                                                                            PX_OPERATIONAL_STATE,
                                                                                                                                            PX_APPPKGINFO_OPERATIONAL_STATE,
                                                                                                                                            PX_USAGE_STATE
                                                                                                                                            PX_USAGE_STATE
                                                                                                                                          ),
                                                                                                                                          ),
                                                                                                                            *
                                                                                                                            *
@@ -2286,7 +2304,7 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                            ))))) {
                            ))))) {
          tc_ac.stop;
          tc_ac.stop;


          log("*** " & testcasename() & ": PASS: IUT successfully responds with an App Package list ***");
          log("*** " & testcasename() & ": PASS: IUT successfully responds with an Onboarded App Package list ***");
          f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
          f_selfOrClientSyncAndVerdict(c_tbDone, e_success);
        }
        }
        [] tc_ac.timeout {
        [] tc_ac.timeout {
@@ -2388,7 +2406,8 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases {
                                                                                           mw_body_json_app_pkg_info(
                                                                                           mw_body_json_app_pkg_info(
                                                                                                                     mw_app_pkg_info(
                                                                                                                     mw_app_pkg_info(
                                                                                                                                     v_app_pkg_info.id,
                                                                                                                                     v_app_pkg_info.id,
                                                                                                                                     v_app_pkg_info.appDId
                                                                                                                                     -,
                                                                                                                                     PX_ONBOARDED_STATE_ONBOARDED
                            )))))) {
                            )))))) {
          tc_ac.stop;
          tc_ac.stop;


+0 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ modules := ../LibCommon \
            ../LibMec/WlanInformationAPI \
            ../LibMec/WlanInformationAPI \
            ../LibMec/FixedAccessInformationServiceAPI \
            ../LibMec/FixedAccessInformationServiceAPI \
            ../LibMec/ApplicationMobilityServiceAPI \
            ../LibMec/ApplicationMobilityServiceAPI \
            ../LibMec/FederationEnablementAPI \
            ../LibMec/IoTAPI \
            ../LibMec/IoTAPI \
            ../../titan-test-system-framework/ccsrc/Framework \
            ../../titan-test-system-framework/ccsrc/Framework \
            ../../titan-test-system-framework/ccsrc/loggers \
            ../../titan-test-system-framework/ccsrc/loggers \
+7 −5
Original line number Original line Diff line number Diff line
@@ -143,11 +143,13 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_Functions {
                                                                          mw_http_message_body_json(
                                                                          mw_http_message_body_json(
                                                                                                    mw_body_json_app_pkg_info(
                                                                                                    mw_body_json_app_pkg_info(
                                                                                                                              mw_app_pkg_info(
                                                                                                                              mw_app_pkg_info(
                                                                                                                                              -, -,
                                                                                                                                              PX_APP_PKG_NAME,
                                                                                                                                              PX_APP_PKG_VERSION,
                                                                                                                                              -,
                                                                                                                                              -,
                                                                                                                                              mw_checksum
                                                                                                                                              mw_checksum(-, PX_CHECKSUM),
                                                                                                                                              CREATED,
                                                                                                                                              -,
                                                                                                                                              -,
                                                                                                                                              - 
                                                                                                                                              
                          )))))) -> value v_response {
                          )))))) -> value v_response {
        tc_ac.stop;
        tc_ac.stop;


+6 −4
Original line number Original line Diff line number Diff line
@@ -54,11 +54,13 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_Pixits {


  modulepar Json.String PX_APP_PKG_PATH := "APP_PKG_PATH";
  modulepar Json.String PX_APP_PKG_PATH := "APP_PKG_PATH";


  modulepar Json.String PX_ONBOARDED_STATE_ONBOARDED := "ONBOARDED";
  modulepar OnboardingState  PX_ONBOARDED_STATE_ONBOARDED := ONBOARDED;


  modulepar Json.String PX_ONBOARDED_STATE := "CREATED";
  modulepar OnboardingState  PX_ONBOARDED_STATE := CREATED;


  modulepar OperationalState PX_OPERATIONAL_STATE := "ENABLED";
  modulepar AppPkgInfo_OperationalState PX_APPPKGINFO_OPERATIONAL_STATE := ENABLED;

  modulepar OperationalState PX_OPERATIONAL_STATE := STARTED;
  
  
  modulepar UsageState PX_USAGE_STATE := NOT_IN_USE;
  modulepar UsageState PX_USAGE_STATE := NOT_IN_USE;
  
  
+1 −1
Original line number Original line Diff line number Diff line
@@ -189,7 +189,7 @@ module ApplicationPackageLifecycleAndOperationGrantingAPI_Templates {
                                                              in String p_appPkgName,
                                                              in String p_appPkgName,
                                                              in String p_appPkgVersion,
                                                              in String p_appPkgVersion,
                                                              in template (value) Checksum p_checksum,
                                                              in template (value) Checksum p_checksum,
                                                              in AnyURI p_appPkgPath
                                                              in template (omit) AnyURI p_appPkgPath := omit
                                                              ) := {
                                                              ) := {
      appPkgName      := p_appPkgName,
      appPkgName      := p_appPkgName,
      appPkgVersion   := p_appPkgVersion,
      appPkgVersion   := p_appPkgVersion,