Add submodule for common TITAN framework; Re-organize ATSs (05df0e39) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

.gitmodules

+4 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,7 @@
		[submodule "ttcn\\LibIts"]
		path = ttcn\\LibIts
		url = https://forge.etsi.org/rep/LIBS/LibIts
		[submodule "titan-test-system-framework"]
		path = titan-test-system-framework
		url = https://labs.etsi.org/rep/cti-tools/titan-test-system-framework.git
		branch = devel

.jenkins.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ cd ./virtualization/docker

		if [ "$1" == "--remove" ]
		then
		docker rmi --force ttf_t012_mec:latest
		docker rmi --force mec_devel:latest
		fi

		cd -

ccsrc/EncDec/LibHttp/LibItsHttp_Encdec.cc

deleted100644 → 0

+0 −28

Original line number	Diff line number	Diff line

		#include "LibItsHttp_MessageBodyTypes.hh"

		#include "http_codec.hh"

		#include "loggers.hh"

		namespace LibItsHttp__EncdecDeclarations {

		BITSTRING fx__enc__http__message(const LibItsHttp__TypesAndValues::HttpMessage& p) {
		loggers::get_instance().log_msg(">>> fx__enc__http__message: ", (const Base_Type&)p);

		OCTETSTRING os;
		http_codec codec;
		codec.encode(p, os);

		return oct2bit(os);
		}
		INTEGER fx__dec__http__message(BITSTRING& pdu, LibItsHttp__TypesAndValues::HttpMessage& p) {
		loggers::get_instance().log_msg(">>> fx__dec__http__message: ", pdu);

		OCTETSTRING os = bit2oct(pdu);
		http_codec codec;
		codec.decode(os, p);

		return 0;
		}
		} // End of namespace LibItsHttp__EncdecDeclarations

ccsrc/EncDec/LibHttp/module.mk

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		sources := LibItsHttp_Encdec.cc

ccsrc/Framework/include/base_time.hh

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		/*!
		* \file base_time.hh
		* \brief Header file for the control port base_time functionality.
		* \author ETSI STF525
		* \copyright ETSI Copyright Notification
		* No part may be reproduced except as authorized by written permission.
		* The copyright and the foregoing restriction extend to reproduction in all media.
		* All rights reserved.
		* \version 0.1
		*/
		#pragma once

		#include <chrono>

		/**
		* \class base_time
		* \brief This class provides time tools such as getting current time
		*/
		class base_time {
		const unsigned long long its_base_time_ms = 1072915200000L; //! Base time 01/01/2004 12:00am in millseconds

		static base_time* _instance;
		private:
		base_time() { }; //! Can not be created manually
		public:
		static inline base_time& get_instance();

		virtual ~base_time() { if (_instance != nullptr) delete _instance; };

		public:
		inline const unsigned long long get_current_time_ms() const;
		inline const unsigned long long get_its_base_time_ms() const;
		inline const unsigned long long get_its_current_time_ms() const;
		inline const unsigned long long get_its_current_time_us() const;
		inline const unsigned long long get_its_current_time_mod_ms() const;
		}; // End of class base_time

		// static functions
		base_time& base_time::get_instance() {
		return (_instance != nullptr) ? _instance : (_instance = new base_time());
		}

		const unsigned long long base_time::get_current_time_ms() const {
		return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
		}

		const unsigned long long base_time::get_its_base_time_ms() const {
		return base_time::its_base_time_ms;
		}

		const unsigned long long base_time::get_its_current_time_ms() const {
		return std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count() - base_time::its_base_time_ms;
		}

		const unsigned long long base_time::get_its_current_time_us() const {
		return std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::system_clock::now().time_since_epoch()).count() - base_time::its_base_time_ms * 1000;
		}

		const unsigned long long base_time::get_its_current_time_mod_ms() const {
		return (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count() - base_time::its_base_time_ms) % 65536;
		}

Admin message