Commit be9bd3b2 authored by Denis Filatov's avatar Denis Filatov
Browse files

Merge branch 'devel2' of https://forge.etsi.org/rep/ITS/ttcn/ats_pki_ts103525-3 into devel2

parents e9b74c98 893832dd
Loading
Loading
Loading
Loading
+8803 −0

File added.

Preview size limit exceeded, changes collapsed.

+52 −0
Original line number Original line Diff line number Diff line
module ItsPkiItss_TestControl {
  
  // LibItsPki
  import from LibItsPki_Pics all;
  
  // AtsPki
  import from ItsPkiItss_TestCases all;
  
  control {
    
    if (PICS_IUT_ITS_S_ROLE) {
      if (PICS_SECPKI_ENROLMENT) {
        execute(TC_SECPKI_ITSS_ENR_01_BV());
        execute(TC_SECPKI_ITSS_ENR_02_BV());
        if (PICS_SECPKI_REENROLMENT) {
          execute(TC_SECPKI_ITSS_ENR_03_BV());
          execute(TC_SECPKI_ITSS_ENR_06_BV_1());
          execute(TC_SECPKI_ITSS_ENR_06_BV_2());
          execute(TC_SECPKI_ITSS_ENR_12_BV());
        }
        if (PICS_SECPKI_CRL) {
          execute(TC_SECPKI_ITSS_ENR_04_BV())
        }
        if (PICS_SECPKI_ENROLLMENT_RETRY) {
          execute(TC_SECPKI_ITSS_ENR_REP_01_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_02_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_03_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_04_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_05_BV());
        }
        execute(TC_SECPKI_ITSS_ENR_05_BV());
        execute(TC_SECPKI_ITSS_ENR_07_BV());
        execute(TC_SECPKI_ITSS_ENR_08_BV_1());
        execute(TC_SECPKI_ITSS_ENR_08_BV_2());
        execute(TC_SECPKI_ITSS_ENR_09_BV_1());
        execute(TC_SECPKI_ITSS_ENR_09_BV_2());
        execute(TC_SECPKI_ITSS_ENR_10_BV_1());
        execute(TC_SECPKI_ITSS_ENR_10_BV_2());
        execute(TC_SECPKI_ITSS_ENR_11_BV());
        
        execute(TC_SECPKI_ITSS_ENR_RECV_01_BV());
        execute(TC_SECPKI_ITSS_ENR_RECV_02_BV());
      }

      if (PICS_SECPKI_AUTHORIZATION) {
        // TODO
      }
    }

  } // End of 'control' statement

}  // End of module module ItsPkiItss_TestControl
+1 −8720

File changed.

Preview size limit exceeded, changes collapsed.

+0 −39
Original line number Original line Diff line number Diff line
@@ -8,45 +8,6 @@ module ItsPki_TestControl {
  
  
  control {
  control {
    
    
    if (PICS_IUT_ITS_S_ROLE) {
      if (PICS_SECPKI_ENROLMENT) {
        execute(TC_SECPKI_ITSS_ENR_01_BV());
        execute(TC_SECPKI_ITSS_ENR_02_BV());
        if (PICS_SECPKI_REENROLMENT) {
          execute(TC_SECPKI_ITSS_ENR_03_BV());
          execute(TC_SECPKI_ITSS_ENR_06_BV_1());
          execute(TC_SECPKI_ITSS_ENR_06_BV_2());
          execute(TC_SECPKI_ITSS_ENR_12_BV());
        }
        if (PICS_SECPKI_CRL) {
          execute(TC_SECPKI_ITSS_ENR_04_BV())
        }
        if (PICS_SECPKI_ENROLLMENT_RETRY) {
          execute(TC_SECPKI_ITSS_ENR_REP_01_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_02_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_03_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_04_BV());
          execute(TC_SECPKI_ITSS_ENR_REP_05_BV());
        }
        execute(TC_SECPKI_ITSS_ENR_05_BV());
        execute(TC_SECPKI_ITSS_ENR_07_BV());
        execute(TC_SECPKI_ITSS_ENR_08_BV_1());
        execute(TC_SECPKI_ITSS_ENR_08_BV_2());
        execute(TC_SECPKI_ITSS_ENR_09_BV_1());
        execute(TC_SECPKI_ITSS_ENR_09_BV_2());
        execute(TC_SECPKI_ITSS_ENR_10_BV_1());
        execute(TC_SECPKI_ITSS_ENR_10_BV_2());
        execute(TC_SECPKI_ITSS_ENR_11_BV());
        
        execute(TC_SECPKI_ITSS_ENR_RECV_01_BV());
        execute(TC_SECPKI_ITSS_ENR_RECV_02_BV());
      }

      if (PICS_SECPKI_AUTHORIZATION) {
        // TODO
      }
    }

    if (PICS_IUT_CA_ROLE) {
    if (PICS_IUT_CA_ROLE) {
      execute(TC_SECPKI_CA_CERTGEN_01_BV());
      execute(TC_SECPKI_CA_CERTGEN_01_BV());
      execute(TC_SECPKI_CA_CERTGEN_02_BV_01());
      execute(TC_SECPKI_CA_CERTGEN_02_BV_01());
+11 −7
Original line number Original line Diff line number Diff line
suite := AtsPki
suite := $(AtsBTP)$(SUB_ATS)
pdu := EtsiTs103097Data EtsiTs102941Data
pdu := EtsiTs103097Data EtsiTs102941Data


sources := ItsPki_Pixits.ttcn \
sources := ItsPki_Pixits.ttcn
           ItsPki_TestCases.ttcn \
ifeq (pki,$(SUB_ATS))
           ItsPki_TestControl.ttcn \
  sources += ItsPki_TestCases.ttcn ItsPki_TestControl.ttcn 
#           ../AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn \
else 
#           ../AtsDENM/lib/asn1/DENM_PDU_Descriptions.asn \
  ifeq (itss,$(SUB_ATS))

    sources += ItsPkiItss_TestCases.ttcn ItsPkiItss_TestControl.ttcn 
  else
    sources += ItsPki_TestCases.ttcn ItsPki_TestControl.ttcn ItsPkiItss_TestCases.ttcn ItsPkiItss_TestControl.ttcn 
  endif
endif


modules :=  lib \
modules :=  lib \
            lib_system \
            lib_system \