Commit 5f3ff7b3 authored by Elian Kraja's avatar Elian Kraja
Browse files

Fix on mec-common

parent d2ca7bd2
Loading
Loading
Loading
Loading
+106 −108
Original line number Diff line number Diff line
@@ -22,13 +22,26 @@ Package MEC_Common {
      type JSON;
      type string with s of type STRING;
      
		type HTTP_MSG;
      //type HTTP_MSG;
      
      type HttpHeaders with
         content_type of type STRING,    // content_type is optional, since not present in GET and DELETE. How to express this concept?
         authorization of type STRING,
         accept of type STRING
        ;
 
      type HttpMsg with
         uri of type  STRING,
         headers of type HttpHeaders,
         Message_Body of type JSON   // body is optional, since not present in GET and DELETE. How to express this concept?
      ;
              
              
       STRING "application/json;charset=utf-8";
       string CONTENT_JSON containing s set to "application/json;charset=utf-8";
      
      		STRING "200 OK";
       string HTTP_200_OK containing s set to "200 OK";
       STRING "200 OK";
        
      STRING "201 CREATED";
      string HTTP_201_CREATED containing s set to "201 CREATED";
@@ -39,57 +52,11 @@ Package MEC_Common {
      STRING "400 BAD REQUEST";
      string HTTP_400_BAD_REQUEST containing s set to "400 BAD REQUEST";

	}
	
	Configuration {
		
		Interface Type myPort accepts string;
		
		Component Type MecAppComponent with gate p of type myPort; 
		Component Type MecPlatformComponent with gate p of type myPort;
		Component Type MecOss with gate p of type myPort;
		Component Type MecOrchestrator with gate p of type myPort;
		Component Type MecPlatformManager with gate p of type myPort;
		
		Test Configuration Config_MEC_1 containing
		 Tester component MEC_App of type MecAppComponent
		 SUT component MEC_Plat of type MecPlatformComponent
		 connection between MEC_App.p and MEC_Plat.p
		;

		Test Configuration Config_MEC_2 containing
		 Tester component MEC_Oss of type MecOss
		 SUT component IUT of type MecOrchestrator
		 connection between MEC_Oss.p and IUT.p
		;

		Test Configuration Config_MEC_3 containing
		 Tester component MEC_Platform_Manager of type MecPlatformManager
		 SUT component MEC_Orchestrator of type MecOrchestrator
		 connection between MEC_Platform_Manager.p and MEC_Orchestrator.p
		;
	}
	
	Extended_Http_Method {
	
		type STRING;

        type HttpHeaders with
			content_type of type STRING,    // content_type is optional, since not present in GET and DELETE. How to express this concept?
            authorization of type STRING,
			accept of type STRING
        ;
 
		type HTTP_MSG with
			uri of type  STRING,
			headers of type HttpHeaders,
			Message_Body of type JSON   // body is optional, since not present in GET and DELETE. How to express this concept?
		;

      STRING VALID_TOKEN;

      STRING "application/json";
        
        
      HttpHeaders vHeadersGet containing
         accept set to "application/json",
         authorization set to VALID_TOKEN
@@ -101,21 +68,52 @@ Package MEC_Common {
         authorization set to VALID_TOKEN
      ;
      
		HTTP_MSG vGET containing
      HttpMsg vGET containing
         headers set to vHeadersGet
      ;

		HTTP_MSG vPOST containing
      HttpMsg vPOST containing
         headers set to vHeaders
      ;
      
		HTTP_MSG vPUT containing
      HttpMsg vPUT containing
          headers set to vHeaders
      ;
      
		HTTP_MSG vDELETE containing
      HttpMsg vDELETE containing
         headers set to vHeadersGet
      ;
      
   }
   
   Configuration {
      
      Interface Type myPort accepts string;
      
      Component Type MecAppComponent with gate p of type myPort; 
      Component Type MecPlatformComponent with gate p of type myPort;
      Component Type MecOss with gate p of type myPort;
      Component Type MecOrchestrator with gate p of type myPort;
      Component Type MecPlatformManager with gate p of type myPort;
      
      Test Configuration Config_MEC_1 containing
         Tester component MEC_App of type MecAppComponent
         SUT component IUT of type MecPlatformComponent
         connection between MEC_App.p and IUT.p
      ;

      Test Configuration Config_MEC_2 containing
         Tester component MEC_Oss of type MecOss
         SUT component IUT of type MecOrchestrator
         connection between MEC_Oss.p and IUT.p
      ;

      Test Configuration Config_MEC_3 containing
         Tester component MEC_Platform_Manager of type MecPlatformManager
         SUT component IUT of type MecOrchestrator
         connection between MEC_Platform_Manager.p and IUT.p
      ;
   }
   
   
}