From 44dc3404781b51393c06301705df7cc9a2621034 Mon Sep 17 00:00:00 2001
From: Lionel Gauthier <lionel.gauthier@eurecom.fr>
Date: Wed, 6 Aug 2014 20:02:39 +0000
Subject: [PATCH] git-svn-id: http://svn.eurecom.fr/openair4G/trunk@5671
 818b1a75-f10b-46b9-bf7c-635c3b92a50f

---
 .../CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf      | 3 ++-
 .../CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf          | 2 +-
 .../CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_calisson.conf       | 2 ++
 .../enb_sfr_olympie-Latitude-E6520.conf                        | 2 ++
 .../CONF/VLAN.VIRTUAL.YANG-HADES/enb.sfr.yang.vlan.conf        | 2 ++
 .../CONF/VSWITCH.VIRTUAL.YANG/enb.sfr.yang.vswitch.conf        | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf     | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf     | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.sud.conf         | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf     | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf         | 2 ++
 targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vlan.conf   | 2 ++
 .../PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vswitch.conf    | 2 ++
 13 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
index 8e361b805f..02db4c22f9 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/enb.calisson.conf
@@ -8,7 +8,8 @@ eNBs =
 (
  {
     ////////// Identification parameters:
-    hard_real_time  =  "yes";
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "hard";
     eNB_ID          =  0xe00;
     cell_type       =  "CELL_MACRO_ENB";
     eNB_name        =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
index dc3ea53398..6f470c1789 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/RT.ENB_IS_CALISSON.MME_IS_YANG/epc.yang.conf
@@ -73,7 +73,7 @@ MME :
     NAS :
     {
         # 3GPP TS 33.401 section 7.2.4.3 Procedures for NAS algorithm selection
-        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA2" , "EIA1" , "EIA0" ];
+        ORDERED_SUPPORTED_INTEGRITY_ALGORITHM_LIST = [ "EIA0" , "EIA1" , "EIA2" ];
         ORDERED_SUPPORTED_CIPHERING_ALGORITHM_LIST = [ "EEA0" , "EEA1" , "EEA2" ];
     };
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_calisson.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_calisson.conf
index d809e92837..a9f3bde76a 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_calisson.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_calisson.conf
@@ -7,6 +7,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_olympie-Latitude-E6520.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_olympie-Latitude-E6520.conf
index 309ee5a711..6420905331 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_olympie-Latitude-E6520.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VIRTUAL.ENB_MME_IN_1_HOST/enb_sfr_olympie-Latitude-E6520.conf
@@ -7,6 +7,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/enb.sfr.yang.vlan.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/enb.sfr.yang.vlan.conf
index 0d8b24b7a2..ed0012574e 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/enb.sfr.yang.vlan.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VLAN.VIRTUAL.YANG-HADES/enb.sfr.yang.vlan.conf
@@ -7,6 +7,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VSWITCH.VIRTUAL.YANG/enb.sfr.yang.vswitch.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VSWITCH.VIRTUAL.YANG/enb.sfr.yang.vswitch.conf
index f548faa68d..f9a89b0f41 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VSWITCH.VIRTUAL.YANG/enb.sfr.yang.vswitch.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/VSWITCH.VIRTUAL.YANG/enb.sfr.yang.vswitch.conf
@@ -3,6 +3,8 @@ Active_eNBs = ( "eNB_Eurecom_0");
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
index 16d3772453..5be5f7ad40 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.centos.nord.conf
@@ -5,6 +5,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
index a9a94cb2e4..f08784c9e3 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.memphis.conf
@@ -6,6 +6,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.sud.conf
index 00f1624fec..3276cb1d34 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.pft.sud.conf
@@ -4,6 +4,8 @@ Active_eNBs = ( "eNB_Eurecom_0");
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
index 5994e02fec..13906defb0 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sequans.sud.conf
@@ -5,6 +5,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "hard";
     ////////// Identification parameters:
     eNB_ID    =  0xe00;
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
index ddfcbd93b0..c6477899ce 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.sud.conf
@@ -4,6 +4,8 @@ Asn1_verbosity = "none";
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     ////////// Identification parameters:
     eNB_ID    =  347472;
     
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vlan.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vlan.conf
index 47ccc82a92..1601564a30 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vlan.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vlan.conf
@@ -3,6 +3,8 @@ Active_eNBs = ( "eNB_Eurecom_0");
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vswitch.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vswitch.conf
index bfadf370eb..d88b1ba472 100755
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vswitch.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.sfr.yang.vswitch.conf
@@ -3,6 +3,8 @@ Active_eNBs = ( "eNB_Eurecom_0");
 eNBs =
 (
  {
+    # real_time choice in {hard, rt-preempt, no}
+    real_time       =  "no";
     eNB_ID    =  347472;
     cell_type =  "CELL_MACRO_ENB";
     eNB_name  =  "eNB_Eurecom_0";
-- 
GitLab