Merge branch 'develop_integration_w05' into 'develop'

Develop integration w05

See merge request !102

.gitlab-ci.yml

@@ -1,37 +1,19 @@
 job1:
   script:
-   - echo $PWD
-   - echo $USER
-   - echo $OAI_USER
-   - echo $OAI_EXTRA_ARGS
-   - echo $NFS_SHARE_DIR
-   - echo $EXTERNAL_SHARE_DIR
-   - echo $SHELL
-   - echo $OAI_TEST_CASE_GROUP
-   - echo $MACHINELIST
-   - echo $MACHINELISTGENERIC
-   - git rev-parse --abbrev-ref HEAD
-   - git_repo=`git config --get remote.origin.url`
-   - git_head=`git rev-parse HEAD`
-   - echo $git_head
-   - tmp=`git show-ref --head | grep $git_head`
-   - tmp=(${tmp///// })
-   - git_branch=${tmp[@]:(-1)}
-   - echo $git_branch
-   - source oaienv
-   - echo $OPENAIR_DIR
-   - NFS_TEST_RESULTS_DIR=$NFS_SHARE_DIR/$git_branch/$git_head
-   - EXTERNAL_SHARE_RESULTS_DIR=$EXTERNAL_SHARE_DIR/$git_branch/$git_head
-   - echo $NFS_TEST_RESULTS_DIR
-   - echo $EXTERNAL_SHARE_RESULTS_DIR
-   - echo $NRUNS_LTE_SOFTMODEM
-   - echo $TIMEOUT_CMD
-   - mkdir -p $OPENAIR_DIR/cmake_targets/autotests/log
-   - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -c -5GRepo $git_repo -MachineList "$MACHINELIST" -MachineListGeneric "$MACHINELISTGENERIC"  -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS  $OAI_EXTRA_ARGS -g "$OAI_TEST_CASE_GROUP">& $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log
-   - python $OPENAIR_DIR/cmake_targets/autotests/run_exec_lte-softmodem_tests.py -r -5GRepo $git_repo -MachineList "$MACHINELIST" -MachineListGeneric "$MACHINELISTGENERIC" -5GRepoHeadVersion $git_head -n $NFS_SHARE_DIR -u $OAI_USER -p $OAI_PASS `echo $OAI_EXTRA_ARGS` -g "$OAI_TEST_CASE_GROUP" --nrun_lte_softmodem $NRUNS_LTE_SOFTMODEM --timeout_cmd $TIMEOUT_CMD >& $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log
-   - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest.log
-   - mv $OPENAIR_DIR/cmake_targets/autotests/python_autotest_cleanup.log $OPENAIR_DIR/cmake_targets/autotests/log/python_autotest_cleanup.log
-   - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no "  --rsync-path="mkdir -p $NFS_TEST_RESULTS_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$NFS_TEST_RESULTS_DIR
-   - sshpass -p "$OAI_PASS" rsync -az -e "ssh -o StrictHostKeyChecking=no "  --rsync-path="mkdir -p $EXTERNAL_SHARE_DIR && rsync" $OPENAIR_DIR/cmake_targets/autotests/log $OAI_USER@localhost:$EXTERNAL_SHARE_DIR
-   - cat $OPENAIR_DIR/cmake_targets/autotests/log/results_autotests.xml
-  when: manual  
+    - date
+    - pwd
+    - echo $OAI_USER
+    - echo $OAI_PASS
+    - echo $OAI_TEST_CASE_GROUP
+    - echo $MACHINELIST
+    - echo $MACHINELISTGENERIC
+    - echo $RESULT_DIR
+    - echo $NRUNS_LTE_SOFTMODEM
+    - source oaienv
+    - rm -rf cmake_targets/autotests/log
+    - mkdir cmake_targets/autotests/log
+    - cd cmake_targets/autotests/v2
+    - python main.py
+    - date
+  only:
+    - triggers

COPYING

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

LICENSE

@@ -0,0 +1,94 @@
+                      OAI PUBLIC LICENSE V1.0
+
+ Copyright (C) 2016 OpenAirInterface Software Alliance, Inc. <http://www.openairinterface.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Definitions.
+“License” shall mean the terms and conditions for use, reproduction, and distribution set forth in this  document.
+
+“Licensor” shall mean the OpenAirInterface Software Alliance.
+
+“Legal Entity” shall mean the union, at the time an acting entity joins the Alliance, of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Object” form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+“OpenAirInterface Software Alliance” shall mean the endowment fund established at the initiative of Eurecom, an educational and research establishment located at Campus Sophia Tech, 450 Route des Chappes, 06410 Biot, France, which statutes were signed on 18 November 2014.
+
+“ “Work” shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that is based on (or derived from) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link (or bind by name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, “submitted” means any form of electronic, , or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work “Contributor License Agreement” shall mean the agreement signed by any Contributor setting forth the terms and conditions applicable to its Contribution. “Contributor” shall mean any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+Grant of Copyright License.
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form
+
+3. Grant of Patent License.
+
+3.1 Grant of Patent License for non-commercial purposes:
+
+Subject to the terms and conditions of this License, Licensor and each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, import, and otherwise transfer the Work, for non-commercial purposes, where such license applies only to those patent claims licensable by such Contributor or Licensor that are necessarily infringed by the Work and/or their Contribution(s) alone or by combination of their Contribution(s) with the Work to which such Contribution(s) was submitted.
+
+3.2 Grant of Patent License for commercial purposes:
+
+For commercial purposes, and subject to the terms and conditions of this License, You commits to be prepared to negotiate a patent license with each Contributor and/or the Licensor on Fair, Reasonable and Non-Discriminatory (“FRAND”) terms and conditions for the Work or Contribution(s) incorporated within the Work.
+
+Licensor and/or each Contributor, by submitting a Contribution, will identify any patent it owns related to the Work and/or its Contribution.
+
+3.3 Patent Litigation
+
+If You institute patent litigation against any entity making non-commercial use of the Work (including a cross-claim or counterclaim in a lawsuit) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistibution
+
+Subject to terms and conditions set forth in articles 2 and 3, You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+
+
+
+1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+2. You must cause any modified files by You to carry prominent notices stating that You changed the files; and
+
+3. You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+4. If the Work includes a “NOTICE” text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+5. Submission of Contributions. Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement such as the Contributor License Agreement You may have executed with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work (and each Contributor provides its Contributions) on an “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall Licensor and any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor and/or the Licensor,and only if You agree to indemnify, defend, and hold each Contributor and/or the Licensor harmless for any liability incurred by, or claims asserted against, such Contributor and/or Licensor by reason of Your accepting any such warranty or additional liability.
+
+10. Applicable law. The present license shall be governed by the laws of France.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the PRESENT OPENAIR 5G License to your work
+To apply the present License to your work, attach the following boilerplate notice, with the fields enclosed by brackets “[]” replaced with your own identifying information. (Don’t include the brackets!) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same “printed page” as the copyright notice for easier identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+Licensed under the License terms and conditions for use, reproduction, and distribution of OPENAIR 5G software (the “License”);
+
+you may not use this file except in compliance with the License.You may obtain a copy of the License at
+Unless required by applicable law or agreed to in writing, software
+
+distributed under the License is distributed on an “AS IS” BASIS,
+
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+
+See the License for the specific language governing permissions and
+
+limitations under the License.

NOTICE.txt

@@ -0,0 +1,21 @@
+The source code of openairinterface5g is distributed under OAI Public License V1.0. 
+For more details of the license, refer to LICENSE file in the same directory.
+
+However, the source code also contains third party software that is acknowledged here for reference.
+
+Credits for LFDS user space source code located in folder openair2/UTILS/LFDS/liblfds6.1.1/
+http://liblfds.org/.
+Extract from http://liblfds.org/pages/downloads_and_license.html:
+"There is no license. You are free to use this software in any way, for any purpose. Go forth and create wealth!
+If however for legal reasons a licence is required, the license of your choice will be granted."
+
+
+Credits for source code common/utils/collection/queue.h:
+The Regents of the University of California: BSD 3-Clause Licence.
+
+
+Credits for source code common/utils/collection/tree.h:
+Niels Provos <provos@citi.umich.edu>: BSD 2-Clause Licence.
+
+
+

README.txt

@@ -1,27 +1,41 @@
-OpenAirInterface is under OpenAirInterface Software Alliance license.
-├── http://www.openairinterface.org/?page_id=101
-├── http://www.openairinterface.org/?page_id=698
-
-The OpenAirInterface (OAI) software is composed of the following parts: 
-
-openairinterface5g
-├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files
-├── common : some common OAI utilities, other tools can be found at openair2/UTILS
-├── COPYING
-├── maketags : script to generate emacs tags
-├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features.
-├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. 
-    ├── LAYER2/RLC/ with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0. 
-    ├── LAYER2/PDCP/PDCP_v10.1.0. 
-    ├── RRC/LITE
-    ├── PHY_INTERFACE
-    ├── X2AP
-    ├── ENB_APP 
-├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
-    ├── GTPV1-U
-    ├── NAS 
-    ├── S1AP
-    ├── SCTP
-    ├── SECU
-    ├── UDP
-└── targets: top level wrapper for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
+OpenAirInterface is under OpenAirInterface Software Alliance license.
+├── http://www.openairinterface.org/?page_id=101
+├── http://www.openairinterface.org/?page_id=698
+
+It is distributed under OAI Public License V1.0. 
+The license information is distributed under LICENSE file in the same directory.
+Please see NOTICE.txt for third party software that is included in the sources.
+
+The OpenAirInterface (OAI) software is composed of the following parts: 
+
+openairinterface5g
+├── cmake_targets: build utilities to compile (simulation, emulation and real-time platforms), and generated build files
+├── common : some common OAI utilities, other tools can be found at openair2/UTILS
+├── LICENSE
+├── maketags : script to generate emacs tags
+├── openair1 : 3GPP LTE Rel-10 PHY layer + PHY RF simulation and a subset of Rel 12 Features.
+├── openair2 :3GPP LTE Rel-10 RLC/MAC/PDCP/RRC/X2AP implementation. 
+    ├── LAYER2/RLC/ with the following subdirectories: UM_v9.3.0, TM_v9.3.0, and AM_v9.3.0. 
+    ├── LAYER2/PDCP/PDCP_v10.1.0. 
+    ├── RRC/LITE
+    ├── PHY_INTERFACE
+    ├── X2AP
+    ├── ENB_APP 
+├── openair3: 3GPP LTE Rel10 for S1AP, NAS GTPV1-U for both ENB and UE.
+    ├── GTPV1-U
+    ├── NAS 
+    ├── S1AP
+    ├── SCTP
+    ├── SECU
+    ├── UDP
+└── targets: top level wrapper for unitary simulation for PHY channels, system-level emulation (eNB-UE with and without S1), and realtime eNB and UE and RRH GW.
+
+
+RELEASE NOTES:
+
+v0.1 -> Last stable commit on develop branch before enhancement-10-harmony
+v0.2 -> Merge of enhancement-10-harmony to include NGFI RRH + New Interface for RF/BBU
+v0.3 -> Last stable commit on develop branch before the merge of feature-131-new-license. This is the last commit with GPL License
+v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
+v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
+v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB

cmake_targets/CMakeLists.txt

@@ -1,30 +1,25 @@
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#   OpenAirInterface is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   OpenAirInterface is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is
-#  included in this distribution in the file called "COPYING". If not,
-#  see <http://www.gnu.org/licenses/>.
-#
-# Contact Information
-# OpenAirInterface Admin: openair_admin@eurecom.fr
-# OpenAirInterface Tech : openair_tech@eurecom.fr
-# OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-# Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # Author: laurent THOMAS, Lionel GAUTHIER
-###############################################################################
 
 cmake_minimum_required (VERSION 2.8)
 
@@ -42,11 +37,6 @@ set (OPENAIR_BIN_DIR ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY})
 
 project (OpenAirInterface)
 
-#add_definitions("-DEMIT_ASN_DEBUG=1")
-add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m lms7002m)
-add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR lmsSDR)
-add_subdirectory(${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C Si5351C)
-
 ###########################################
 # macros to define options as there is numerous options in oai
 ################################################
@@ -124,6 +114,7 @@ endmacro(add_list_string_option)
 ####################################################
 # compilation flags
 #############################################
+#set(CMAKE_BUILD_TYPE "Debug")
 if (CMAKE_BUILD_TYPE STREQUAL "")
    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
 endif()
@@ -186,7 +177,6 @@ set(GIT_BRANCH        "UNKNOWN")
 set(GIT_COMMIT_HASH   "UNKNOWN")
 set(GIT_COMMIT_DATE   "UNKNOWN")
 
-
 find_package(Git)
 if(GIT_FOUND)
   message("git found: ${GIT_EXECUTABLE}")
@@ -241,6 +231,7 @@ add_boolean_option(DEBUG_OMG           False "???")
 add_boolean_option(XFORMS              False "This adds the possibility to see the signal oscilloscope")
 add_boolean_option(PRINT_STATS         False "This adds the possibility to see the status")
 add_boolean_option(T_TRACER            False "Activate the T tracer, a debugging/monitoring framework" )
+add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs")
 
 add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
 
@@ -481,7 +472,7 @@ include_directories ("${X2AP_DIR}")
 # Hardware dependant options
 ###################################
 add_list1_option(NB_ANTENNAS_RX "2" "Number of antennas in reception" "1" "2" "4")
-add_list1_option(NB_ANTENNAS_TX "2" "Number of antennas in transmission" "1" "2" "4")
+add_list1_option(NB_ANTENNAS_TX "4" "Number of antennas in transmission" "1" "2" "4")
 add_list1_option(NB_ANTENNAS_TXRX "2" "Number of antennas in ????" "1" "2" "4")
 
 add_list2_option(RF_BOARD "EXMIMO" "RF head type" "None" "EXMIMO" "OAI_USRP" "OAI_BLADERF" "CPRIGW" "OAI_LMSSDR")
@@ -516,7 +507,7 @@ set(HWLIB_BLADERF_SOURCE
 add_library(oai_bladerfdevif MODULE ${HWLIB_BLADERF_SOURCE} )
 
 include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/")
-set (option_HWLMSSDRLIB_lib "-l LMS_SDR -l LMS7002M -l Si5351C")
+
 set(HWLIB_LMSSDR_SOURCE 
   ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
   )
@@ -563,16 +554,14 @@ elseif (${RF_BOARD} STREQUAL "OAI_BLADERF")
 
 elseif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
   include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB")
-  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR")
-  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms7002m")
-  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/Si5351C")
-  include_directories("${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lmsSDR/LMS_StreamBoard")
+  include_directories("/usr/local/include/lime")
+  include_directories("/usr/include/lime")
   LINK_DIRECTORIES("/usr/lib/x86_64-linux-gnu")
   LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lmsSDR")
   LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/lms7002m")
   LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/Si5351C")
   set(HW_SOURCE ${HW_SOURCE} ${OPENAIR_TARGETS}/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp)
-  set(option_HW_lib "-lLMS_SDR -lLMS7002M -lSi5351C -rdynamic -ldl")
+  set(option_HW_lib "-lLimeSuite -rdynamic -ldl")
 
 elseif (${RF_BOARD} STREQUAL "CPRIGW")
   set(HW_SOURCE ${HW_SOURCE}
@@ -627,7 +616,7 @@ add_boolean_option(MESSAGE_CHART_GENERATOR False         "For generating sequenc
 add_boolean_option(MESSAGE_CHART_GENERATOR_RLC_MAC False "trace RLC-MAC exchanges in sequence diagrams")
 add_boolean_option(MESSAGE_CHART_GENERATOR_PHY     False "trace some PHY exchanges in sequence diagrams")
 
-add_boolean_option(ENB_AGENT                   True         "enable eNB agent to inteface with a SDN contrller")
+add_boolean_option(FLEXRAN_AGENT_SB_IF             False         "enable FlexRAN agent to inteface with a SDN controller")
 
 ########################
 # Include order
@@ -823,8 +812,10 @@ include_directories("${OPENAIR_DIR}/targets/ARCH/COMMON")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/USERSPACE/LIB/")
 include_directories("${OPENAIR_DIR}/targets/ARCH/EXMIMO/DEFS")
 include_directories("${OPENAIR2_DIR}/ENB_APP")
+include_directories("${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC")
 include_directories("${OPENAIR2_DIR}/UTIL/OSA")
 include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds6.1.1/liblfds611/inc")
+include_directories("${OPENAIR2_DIR}/UTIL/LFDS/liblfds7.0.0/liblfds700/inc")
 include_directories("${OPENAIR2_DIR}/UTIL/MEM")
 include_directories("${OPENAIR2_DIR}/UTIL/LISTS")
 include_directories("${OPENAIR2_DIR}/UTIL/FIFO")
@@ -843,11 +834,99 @@ include_directories("${OPENAIR_DIR}")
 
 # Utilities Library
 ################
+if (FLEXRAN_AGENT_SB_IF)
+  # set the version of protobuf messages, V3 not supported yet
+  add_list1_option(FLPT_VERSION V2 "FLPT MSG  protobuf  grammar version" V2 V3)
+  
+  if (${FLPT_VERSION} STREQUAL "V2")
+    set (FLPTDIR V2)
+  elseif (${FLPT_VERSION} STREQUAL "V3")
+    set (FLPTDIR V3)
+  endif(${FLPT_VERSION} STREQUAL "V2")
+  
+  set(FLPT_MSG_DIR ${OPENAIR2_DIR}/ENB_APP/MESSAGES/${FLPTDIR} )
+  set(FLPT_MSG_FILES
+    ${FLPT_MSG_DIR}/header.proto
+    ${FLPT_MSG_DIR}/flexran.proto
+    ${FLPT_MSG_DIR}/stats_common.proto
+    ${FLPT_MSG_DIR}/stats_messages.proto
+    ${FLPT_MSG_DIR}/time_common.proto
+    ${FLPT_MSG_DIR}/controller_commands.proto
+    ${FLPT_MSG_DIR}/mac_primitives.proto
+    ${FLPT_MSG_DIR}/config_messages.proto
+    ${FLPT_MSG_DIR}/config_common.proto
+    ${FLPT_MSG_DIR}/control_delegation.proto
+    )
+
+  set(FLPT_C_DIR ${protobuf_generated_dir}/${FLPTDIR})
+  #message("calling protoc_call=${protoc_call} FLPT_C_DIR=${FLPT_C_DIR} FLPT_MSG_FILES=${FLPT_MSG_FILES}")
+  execute_process(COMMAND ${protoc_call} ${FLPT_C_DIR} ${FLPT_MSG_DIR} ${FLPT_MSG_FILES})
+  file(GLOB FLPT_source ${FLPT_C_DIR}/*.c)
+  set(FLPT_OAI_generated
+    ${FLPT_C_DIR}/header.pb-c.c
+    ${FLPT_C_DIR}/flexran.pb-c.c
+    ${FLPT_C_DIR}/stats_common.pb-c.c
+    ${FLPT_C_DIR}/stats_messages.pb-c.c
+    ${FLPT_C_DIR}/time_common.pb-c.c
+    ${FLPT_C_DIR}/controller_commands.pb-c.c
+    ${FLPT_C_DIR}/mac_primitives.pb-c.c
+    ${FLPT_C_DIR}/config_messages.pb-c.c
+    ${FLPT_C_DIR}/config_common.pb-c.c
+    ${FLPT_C_DIR}/control_delegation.pb-c.c
+    )
+  
+  file(GLOB flpt_h ${FLPT_C_DIR}/*.h)
+  set(flpt_h ${flpt_h} )
+  
+  add_library(FLPT_MSG
+    ${FLPT_OAI_generated}
+    ${FLPT_source}
+    )
+  set(FLPT_MSG_LIB FLPT_MSG)
+  #message("prpt c dir is : ${FLPT_C_DIR}")
+  include_directories (${FLPT_C_DIR})
+
+  add_library(ASYNC_IF
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/socket_link.c
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/link_manager.c
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/message_queue.c
+    ${OPENAIR2_DIR}/UTIL/ASYNC_IF/ringbuffer_queue.c
+    )
+  set(ASYNC_IF_LIB ASYNC_IF)
+  include_directories(${OPENAIR2_DIR}/UTIL/ASYNC_IF)
+
+ add_library(FLEXRAN_AGENT
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_handler.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_common.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_common_internal.c
+    ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_task_manager.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_net_comm.c
+    ${OPENAIR2_DIR}/ENB_APP/flexran_agent_async.c
+    ${OPENAIR2_DIR}/ENB_APP/CONTROL_MODULES/MAC/flexran_agent_mac_internal.c
+    )
+  set(FLEXRAN_AGENT_LIB FLEXRAN_AGENT)
+  #include_directories(${OPENAIR2_DIR}/ENB_APP)
+  
+  set(PROTOBUF_LIB "protobuf-c")
+  
+  FIND_PATH(LIBYAML_INCLUDE_DIR NAMES yaml.h)
+  FIND_LIBRARY(LIBYAML_LIBRARIES NAMES yaml libyaml)
+  
+  INCLUDE(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Yaml DEFAULT_MSG LIBYAML_LIBRARIES LIBYAML_INCLUDE_DIR)
+  MARK_AS_ADVANCED(LIBYAML_INCLUDE_DIR LIBYAML_LIBRARIES)
+
+  #set(PROTOBUF_LIB "protobuf") #for Cpp
+endif()
+
+
 add_library(HASHTABLE
-  ${OPENAIR_DIR}/common/utils/collection/hashtable/hashtable.c
-  ${OPENAIR_DIR}/common/utils/collection/hashtable/obj_hashtable.c
+  ${OPENAIR_DIR}/common/utils/hashtable/hashtable.c
+  ${OPENAIR_DIR}/common/utils/hashtable/obj_hashtable.c
 )
-include_directories(${OPENAIR_DIR}/common/utils/collection/hashtable)
+include_directories(${OPENAIR_DIR}/common/utils/hashtable)
 
 if (MESSAGE_CHART_GENERATOR)
   add_library(MSC  
@@ -875,20 +954,16 @@ set(UTIL_SRC
   ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_filename.c
   ${OPENAIR2_DIR}/UTIL/OCG/OCG_parse_XML.c
   ${OPENAIR2_DIR}/UTIL/OCG/OCG_save_XML.c
-  ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
   ${OPENAIR2_DIR}/UTIL/OMG/common.c
   ${OPENAIR2_DIR}/UTIL/OMG/grid.c
-  ${OPENAIR2_DIR}/UTIL/OMG/id_manager.c
   ${OPENAIR2_DIR}/UTIL/OMG/job.c
   ${OPENAIR2_DIR}/UTIL/OMG/mobility_parser.c
   ${OPENAIR2_DIR}/UTIL/OMG/omg.c
-  ${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
+  #${OPENAIR2_DIR}/UTIL/OMG/omg_hashtable.c
   ${OPENAIR2_DIR}/UTIL/OMG/rwalk.c
   ${OPENAIR2_DIR}/UTIL/OMG/rwp.c
-  ${OPENAIR2_DIR}/UTIL/OMG/socket_traci_OMG.c
   ${OPENAIR2_DIR}/UTIL/OMG/static.c
   ${OPENAIR2_DIR}/UTIL/OMG/steadystaterwp.c
-  ${OPENAIR2_DIR}/UTIL/OMG/storage_traci_OMG.c
   ${OPENAIR2_DIR}/UTIL/OMG/trace.c
   ${OPENAIR2_DIR}/UTIL/OMG/trace_hashtable.c
   ${OPENAIR2_DIR}/UTIL/OPT/probe.c
@@ -901,6 +976,15 @@ set(UTIL_SRC
   )
 add_library(UTIL ${UTIL_SRC})
 
+#set(OMG_SUMO_SRC
+#  ${OPENAIR2_DIR}/UTIL/OMG/client_traci_OMG.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/id_manager.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/socket_traci_OMG.c
+#  ${OPENAIR2_DIR}/UTIL/OMG/storage_traci_OMG.c
+#  )
+#add_library(OMG_SUMO ${OMG_SUMO_SRC})
+
 set(SECU_OSA_SRC
   ${OPENAIR2_DIR}/UTIL/OSA/osa_key_deriver.c
   ${OPENAIR2_DIR}/UTIL/OSA/osa_rijndael.c
@@ -931,6 +1015,7 @@ set(SCHED_SRC
   ${OPENAIR1_DIR}/SCHED/phy_mac_stub.c
   ${OPENAIR1_DIR}/SCHED/pucch_pc.c
   ${OPENAIR1_DIR}/SCHED/pusch_pc.c
+  ${OPENAIR1_DIR}/SCHED/srs_pc.c
 )
 add_library(SCHED_LIB ${SCHED_SRC})
 
@@ -979,11 +1064,14 @@ set(PHY_SRC
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_mbsfn.c
   ${OPENAIR1_DIR}/PHY/MODULATION/slot_fep_ul.c
   ${OPENAIR1_DIR}/PHY/MODULATION/ul_7_5_kHz.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/beamforming.c
+  ${OPENAIR1_DIR}/PHY/MODULATION/compute_bf_weights.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/freq_equalization.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_time.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_sync_timefreq.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_adjust_sync.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
+  ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_bf_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_mbsfn_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ul_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_est_freq_offset.c
@@ -1096,7 +1184,17 @@ set (MAC_SRC
   ${MAC_DIR}/eNB_scheduler_RA.c
   ${MAC_DIR}/pre_processor.c
   ${MAC_DIR}/config.c
-  )
+ )
+
+if (FLEXRAN_AGENT_SB_IF)
+
+set (MAC_SRC ${MAC_SRC}
+  ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue.c
+  ${MAC_DIR}/flexran_agent_scheduler_dataplane.c
+  ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue_remote.c
+)
+
+endif()
 
 set (ENB_APP_SRC
   ${OPENAIR2_DIR}/ENB_APP/enb_app.c
@@ -1109,6 +1207,14 @@ add_library(L2
   ${ENB_APP_SRC})
 #  ${OPENAIR2_DIR}/RRC/L2_INTERFACE/openair_rrc_L2_interface.c)
 
+if (FLEXRAN_AGENT_SB_IF)
+
+#Test for adding a shared library
+add_library(default_sched SHARED ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue.c)
+add_library(remote_sched SHARED ${MAC_DIR}/flexran_agent_scheduler_dlsch_ue_remote.c)
+
+endif()
+
 # L3 Libs
 ##########################
 
@@ -1469,6 +1575,23 @@ add_library(LFDS
   ${lfds}/lfds611_abstraction/lfds611_abstraction_malloc.c
 )
 
+set(lfds7 ${OPENAIR2_DIR}/UTIL/LFDS/liblfds7.0.0/liblfds700/src/)
+file(GLOB lfds7_queue ${lfds7}/lfds700_queue/*.c)
+file(GLOB lfds7_ring ${lfds7}/lfds700_ringbuffer/*.c)
+file(GLOB lfds7_qbss ${lfds7}/lfds700_queue_bounded_singleconsumer_singleproducer/*.c)
+file(GLOB lfds7_stack ${lfds7}/lfds700_stack/*.c)
+file(GLOB lfds7_freelist ${lfds7}/lfds700_freelist/*.c)
+file(GLOB lfds7_btree ${lfds7}/lfds700_btree_addonly_unbalanced/*.c)
+file(GLOB lfds7_hash ${lfds7}/lfds700_hash_addonly/*.c)
+file(GLOB lfds7_ordered_list ${lfds7}/lfds700_list_addonly_ordered_singlylinked/*.c)
+file(GLOB lfds7_unordered_list ${lfds7}/lfds700_list_addonly_singlylinked_unordered/*.c)
+file(GLOB lfds7_misc ${lfds7}/lfds700_misc/*.c)
+
+include_directories(${lfds7})
+add_library(LFDS7
+  ${lfds7_queue} ${lfds7_ring} ${lfds7_qbss} ${lfds7_stack} ${lfds7_freelist} ${lfds7_btree} ${lfds7_hash} ${lfds7_ordered_list} ${lfds7_unordered_list} ${lfds7_misc}
+)
+
 # Simulation library
 ##########################
 add_library(SIMU
@@ -1532,11 +1655,25 @@ endif()
 
 pkg_search_module(NETTLE nettle)
 if(NOT ${NETTLE_FOUND})
-  message("PACKAGE nettle not found: some targets will fail")
+  message( FATAL_ERROR "PACKAGE nettle not found: some targets will fail. Run build_oai -I again!")
 else()
   include_directories(${NETTLE_INCLUDE_DIRS})
 endif()
 
+message ("NETTLE VERSION_INSTALLED  = ${NETTLE_VERSION}")
+
+string(REGEX REPLACE "([0-9]+).*" "\\1" NETTLE_VERSION_MAJOR ${NETTLE_VERSION})
+string(REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" NETTLE_VERSION_MINOR ${NETTLE_VERSION})
+message ("NETTLE_VERSION_MAJOR = ${NETTLE_VERSION_MAJOR}")
+message ("NETTLE_VERSION_MINOR = ${NETTLE_VERSION_MINOR}")
+
+if ("${NETTLE_VERSION_MAJOR}" STREQUAL "" OR "${NETTLE_VERSION_MINOR}" STREQUAL "")
+  message( FATAL_ERROR "The nettle version not detected properly. Try to run build_oai -I again" )
+endif()
+
+add_definitions("-DNETTLE_VERSION_MAJOR=${NETTLE_VERSION_MAJOR}")
+add_definitions("-DNETTLE_VERSION_MINOR=${NETTLE_VERSION_MINOR}")
+
 pkg_search_module(XPM xpm)
 if(NOT ${XPM_FOUND})
   message("PACKAGE xpm not found: some targets will fail")
@@ -1547,7 +1684,7 @@ endif()
 # Atlas is required by some packages, but not found in pkg-config
 if(EXISTS "/usr/include/atlas/cblas.h")
   include_directories("/usr/include/atlas")
-  list(APPEND ATLAS_LIBRARIES lapack cblas atlas)
+  list(APPEND ATLAS_LIBRARIES cblas atlas lapack)
 else()
   message("No Blas/Atlas libs found, some targets will fail")
 endif()
@@ -1631,11 +1768,11 @@ add_executable(lte-softmodem
 
 target_link_libraries (lte-softmodem -ldl
   -Wl,--start-group
-  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} 
+  RRC_LIB S1AP_LIB S1AP_ENB GTPV1U SECU_CN SECU_OSA UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ) 
+target_link_libraries (lte-softmodem pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES} sctp ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ${PROTOBUF_LIB}  ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem ${T_LIB})
 
@@ -1665,11 +1802,11 @@ add_executable(lte-softmodem-nos1
   )
 target_link_libraries (lte-softmodem-nos1
   -Wl,--start-group
-  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB}
+  RRC_LIB SECU_CN SECU_OSA UTIL HASHTABLE SCHED_LIB PHY LFDS L2 ${MSC_LIB} ${RAL_LIB} ${ITTI_LIB} ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (lte-softmodem-nos1 ${LIBXML2_LIBRARIES})
-target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib}  ${option_TP_lib} ${XFORMS_LIBRARIES} )
+target_link_libraries (lte-softmodem-nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES} ${NETTLE_LIBRARIES}  ${option_HW_lib} ${option_TP_lib} ${XFORMS_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1  ${LIB_LMS_LIBRARIES})
 target_link_libraries (lte-softmodem-nos1 ${T_LIB})
 
@@ -1701,14 +1838,6 @@ Message("-- HW_SOURCE=${HW_SOURCE}")
 Message("-- option_TP_lib=${option_TP_lib}")
 Message("-- TRANSPORT_SOURCE=${TRANSPORT_SOURCE}")
 
-if (${RF_BOARD} STREQUAL "OAI_LMSSDR")
-  add_dependencies(lte-softmodem LMS7002M LMS_SDR Si5351C)
-  add_dependencies(lte-softmodem-nos1 LMS7002M LMS_SDR Si5351C)
-  add_dependencies(rrh_gw LMS7002M LMS_SDR Si5351C)
-endif (${RF_BOARD} STREQUAL "OAI_LMSSDR")
-
-
-
 # USIM process
 #################
 #add_executable(usim
@@ -1756,7 +1885,6 @@ add_executable(oaisim
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
   ${OPENAIR3_DIR}/NAS/UE/nas_ue_task.c
   ${GTPU_need_ITTI}
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
@@ -1802,7 +1930,6 @@ add_executable(oaisim_nos1
   ${OPENAIR_TARGETS}/SIMU/USER/oaisim.c
   ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
   ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
-  ${OPENAIR2_DIR}/UTIL/OMG/sumo.c
   ${OPENAIR_TARGETS}/COMMON/create_tasks.c
   ${HW_SOURCE}
   ${TRANSPORT_SOURCE}  
@@ -1812,20 +1939,24 @@ add_executable(oaisim_nos1
 target_include_directories(oaisim_nos1 PUBLIC  ${OPENAIR_TARGETS}/SIMU/USER)
 target_link_libraries (oaisim_nos1
   -Wl,--start-group
-  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB}
+  RRC_LIB X2AP_LIB SECU_CN UTIL HASHTABLE SCHED_LIB PHY LFDS ${MSC_LIB} L2 ${RAL_LIB} SIMU SIMU_ETH SECU_OSA ${ITTI_LIB}  ${MIH_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7
   -Wl,--end-group )
 
 target_link_libraries (oaisim_nos1 ${LIBXML2_LIBRARIES} ${LAPACK_LIBRARIES})
-target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib}  ${option_TP_lib}
-  ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES})
+target_link_libraries (oaisim_nos1 pthread m ${CONFIG_LIBRARIES} rt crypt ${CRYPTO_LIBRARIES} ${OPENSSL_LIBRARIES}  ${NETTLE_LIBRARIES}  ${option_HW_lib} ${option_TP_lib}
+  ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${OPENPGM_LIBRARIES} ${PROTOBUF_LIB} ${CMAKE_DL_LIBS} ${LIBYAML_LIBRARIES})
 #Force link with forms, regardless XFORMS option
 target_link_libraries (oaisim_nos1 forms)
+
+#message("protobuflib is  ${PROTOBUF_LIB}")
+
 target_link_libraries (oaisim_nos1 ${T_LIB})
 
+
 # Unitary tests for each piece of L1: example, mbmssim is MBMS L1 simulator
 #####################################
 
-foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
+foreach(myExe dlsim dlsim_tm7 ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syncsim)
   add_executable(${myExe}
     ${OPENAIR_BIN_DIR}/messages_xml.h
     ${OPENAIR1_DIR}/SIMULATION/LTE_PHY/${myExe}.c
@@ -1833,7 +1964,8 @@ foreach(myExe dlsim ulsim pbchsim scansim mbmssim pdcchsim pucchsim prachsim syn
     ${T_SOURCE}
     )
   target_link_libraries (${myExe}
-    -Wl,--start-group SIMU UTIL SCHED_LIB PHY LFDS ${ITTI_LIB} -Wl,--end-group
+
+    -Wl,--start-group SIMU UTIL SCHED_LIB PHY LFDS ${ITTI_LIB} LFDS7 -Wl,--end-group
     pthread m rt ${CONFIG_LIBRARIES} ${ATLAS_LIBRARIES} ${XFORMS_LIBRARIES} ${T_LIB}
     )
 endforeach(myExe)
@@ -1887,7 +2019,6 @@ foreach(myExe s1ap
     aes128_cmac_encrypt
     secu_knas_encrypt_eia2)
   add_executable(test_${myExe}
-    ${OPENAIR3_DIR}/TEST/test_util.c
     ${OPENAIR3_DIR}/TEST/test_${myExe}.c
     )
   target_link_libraries (test_${myExe}
@@ -1907,6 +2038,7 @@ if (${T_TRACER})
   add_dependencies(oaisim generate_T)
   add_dependencies(oaisim_nos1 generate_T)
   add_dependencies(dlsim generate_T)
+  add_dependencies(dlsim_tm7 generate_T)
   add_dependencies(ulsim generate_T)
   add_dependencies(pbchsim generate_T)
   add_dependencies(scansim generate_T)

cmake_targets/at_commands/CMakeLists.txt

@@ -1,30 +1,26 @@
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#   OpenAirInterface is free software: you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation, either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   OpenAirInterface is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is
-#  included in this distribution in the file called "COPYING". If not,
-#  see <http:/www.gnu.org/licenses/>.
-#
-# Contact Information
-# OpenAirInterface Admin: openair_admin@eurecom.fr
-# OpenAirInterface Tech : openair_tech@eurecom.fr
-# OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-# Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # Author: Lionel GAUTHIER
-###############################################################################
+
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
@@ -92,6 +88,24 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.2 -std=gnu99 -Wall -Wstrict-prototype
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -DMALLOC_CHECK_=3")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -ggdb -DMALLOC_CHECK_=3 -O2")
 
+#This is to detect nettle version changes between Ubuntu 14.04/16.04
+set ( nettle_cmd "nettle-hash" )
+set ( nettle_arg "-V" )
+execute_process(COMMAND  ${nettle_cmd} ${nettle_arg}   RESULT_VARIABLE rv OUTPUT_VARIABLE ov ERROR_VARIABLE ev)
+
+string(REGEX MATCH "[+-]?[0-9]+([.][0-9]+)?" nv ${ov})
+
+message("NETTLE_VERSION = ${nv}")
+
+# we need to remove decimal as floating point arithematic does not work properly with C preprocessor
+STRING(REGEX REPLACE "[.]" "" nv ${nv})
+
+if ("${nv}" STREQUAL "")
+  message( FATAL_ERROR "The nettle version not detected properly. Try to run build_oai -I again" )
+endif()
+
+set (NETTLE_VERSION "${nv}")
+add_definitions("-DNETTLE_VERSION=${NETTLE_VERSION}")
 
 include(FindPkgConfig)
 

cmake_targets/autotests/README.txt

@@ -1,5 +1,4 @@
 OAI Test PLAN
-#UNDER CONSTRUCTION. Not correct at the moment
 
 Obj.#   Case#   Test#	Description
 
@@ -219,7 +218,7 @@ Obj.#   Case#   Test#	Description
 01      70      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
 
-01      75      00      lte-softmodem + RRH tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      75      00      lte-softmodem + RRU (NGFI IF4P5, RAW) tests with B210 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      75      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      75      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      75      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -227,7 +226,7 @@ Obj.#   Case#   Test#	Description
 01      75      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      75      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      80      00      lte-softmodem + RRH tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      80      00      lte-softmodem + RRU (NGFI) tests with BladeRF RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      80      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      80      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      80      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -235,7 +234,7 @@ Obj.#   Case#   Test#	Description
 01      80      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
 01      80      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
 
-01      85      00      lte-softmodem + RRH tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
+01      85      00      lte-softmodem + RRU (NGFI) tests with USRP X310 RF as eNB and ALU EPC w/ Bandrich COTS UE for TX/1RX
 01      85      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
 01      85      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
 01      85      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
@@ -269,6 +268,15 @@ Obj.#   Case#   Test#	Description
 02      55      22      Band 7 FDD 10MHz DL Throughput (TCP) for 300 sec for 2TX/2RX (TM2)
 02      55      23      Band 7 FDD 20MHz DL Throughput (TCP) for 300 sec for 2TX/2RX (TM2) 
 
+02      57              lte-softmodem tests with USRP B210 RF as eNB and OAI EPC (eNB and EPC are on different machines) w/ OAI UE
+02      57      00      Band 7 FDD 5MHz UL Throughput for 300 sec for 1TX/1RX
+02      57      01      Band 7 FDD 10MHz UL Throughput for 300 sec for 1TX/1RX
+02      57      02      Band 7 FDD 20MHz UL Throughput for 300 sec for 1TX/1RX
+02      57      03      Band 7 FDD 5MHz DL Throughput for 300 sec for 1TX/1RX
+02      57      04      Band 7 FDD 10MHz DL Throughput for 300 sec for 1TX/1RX
+02      57      05      Band 7 FDD 20MHz DL Throughput for 300 sec for 1TX/1RX
+
+
 01      64              lte-softmodem-noS1 tests
 
 02                      Functional test case

cmake_targets/autotests/core.py

@@ -1,31 +1,23 @@
-#******************************************************************************
-
-#  Eurecom OpenAirInterface
-#  Copyright(c) 1999 - 2013 Eurecom
-
-#  This program is free software; you can redistribute it and/or modify it
-#  under the terms and conditions of the GNU General Public License,
-#  version 2, as published by the Free Software Foundation.
-
-#  This program is distributed in the hope it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-#  more details.
-
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-#  The full GNU General Public License is included in this distribution in
-#  the file called "COPYING".
-
-#  Contact Information
-#  Openair Admin: openair_admin@eurecom.fr
-#  Openair Tech : openair_tech@eurecom.fr
-#  Forums       : http://forums.eurecom.fsr/openairinterface
-#  Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France
-
-#*****************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
 # \file core.py
 # \brief OAI core testing class that provides various primitives to send/recv cmd to openair class searching for patterns and process the responses and tag the test case as passed/failed/skipped 

cmake_targets/autotests/log.py

@@ -1,31 +1,23 @@
-#******************************************************************************
-
-#  Eurecom OpenAirInterface
-#  Copyright(c) 1999 - 2013 Eurecom
-
-#  This program is free software; you can redistribute it and/or modify it
-#  under the terms and conditions of the GNU General Public License,
-#  version 2, as published by the Free Software Foundation.
-
-#  This program is distributed in the hope it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-#  more details.
-
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-#  The full GNU General Public License is included in this distribution in
-#  the file called "COPYING".
-
-#  Contact Information
-#  Openair Admin: openair_admin@eurecom.fr
-#  Openair Tech : openair_tech@eurecom.fr
-#  Forums       : http://forums.eurecom.fsr/openairinterface
-#  Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France
-
-#*****************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
 # \file log.py
 # \brief provides primitives and defines how the logs and statistics are generated

cmake_targets/autotests/openair.py

@@ -1,31 +1,23 @@
-#******************************************************************************
-
-#  Eurecom OpenAirInterface
-#  Copyright(c) 1999 - 2013 Eurecom
-
-#  This program is free software; you can redistribute it and/or modify it
-#  under the terms and conditions of the GNU General Public License,
-#  version 2, as published by the Free Software Foundation.
-
-#  This program is distributed in the hope it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-#  more details.
-
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc.,
-#  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-#  The full GNU General Public License is included in this distribution in
-#  the file called "COPYING".
-
-#  Contact Information
-#  Openair Admin: openair_admin@eurecom.fr
-#  Openair Tech : openair_tech@eurecom.fr
-#  Forums       : http://forums.eurecom.fsr/openairinterface
-#  Address      : Eurecom, Compus SophiaTech 450, route des chappes, 06451 Biot, France
-
-#*****************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
 # \file openair.py
 # \brief class that define the oaisim class and its attributes
@@ -83,7 +75,7 @@ class openair(core):
         return (stdout, stderr)
 
     def connect(self, username, password, prompt='PEXPECT_OAI'):
-     max_retries=100
+     max_retries=10
      i=0
      while i <= max_retries:  
         self.prompt1 = prompt
@@ -105,9 +97,9 @@ class openair(core):
             # need to look for twice the string of the prompt
             self.oai.prompt()
             self.oai.prompt()
-            self.oai.sendline('uptime')
-            self.oai.prompt()
-            print self.oai.before
+#            self.oai.sendline('uptime')
+#            self.oai.prompt()
+#           print self.oai.before
             break
         except Exception, e:
             error=''
@@ -179,7 +171,7 @@ class openair(core):
                sys.exit(1)
 
     def disconnect(self):
-        print 'disconnecting the ssh connection to ' + self.address + '\n'
+#        print 'disconnecting the ssh connection to ' + self.address + '\n'
         self.oai.send('exit')
 #        self.cancel()
 

cmake_targets/autotests/run_compilation_autotests.bash

@@ -1,4 +1,26 @@
 #!/bin/bash
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+# \author Navid Nikaein, Rohit Gupta
 
 if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper ] ; then
    source $OPENAIR_DIR/cmake_targets/tools/build_helper

cmake_targets/autotests/run_exec_autotests.bash

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 if [ -s $OPENAIR_DIR/cmake_targets/tools/build_helper ] ; then

cmake_targets/autotests/templates/index.html

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>OAI5G UE Autotest Report</title>
+    <script type="text/javascript">
+    function showhide(id) {
+      var e = document.getElementById(id);
+     e.style.display = (e.style.display == 'block') ? 'none' : 'block';
+    }
+</script>
+</head>
+<style>
+table, th, td {
+    border: 1px solid black;
+    border-collapse: collapse;
+    padding: 5px;
+}
+</style>
+<body>
+<center>
+<h2>OAI5G UE Autotest Report</h2>
+</center>
+
+<p>
+  <table border>
+    <caption>Test session configuration</caption>
+    <tr><td>Start time</td><td>{{test_session_start_time}}</td></tr>
+    <tr><td>Stop time</td><td>{{test_session_stop_time}}</td></tr>
+    <tr><td>Duration</td><td>{{test_session_duration}}</td></tr>    
+    <tr><td>MTC host</td><td>{{mtc_host}}</td></tr>
+    <tr><td>User</td><td>{{user}}</td></tr>
+    <tr><td>Password</td><td>{{password}}</td></tr>
+  </table>
+</p>
+
+
+<h3>Test Setup</h3>
+To be complete
+
+<br></br>
+<h3>UE phy-test performances tests results</h3>
+<h4>Objectives</h4>
+<p>Checks that OAI UE can achieve at least 75 percent of the theoretical throughput.</p>
+<p>Tests are done for all MCS (0 to 28) for 5MHz and 10MHz bandwidth.</p>
+<h4>Results</h4>
+
+<table>
+<TR><TH>ID</TH><TH>TAG</TH><TH>VERDICT</TH><TH>NB RUNS</TH><TH>PASS</TH><TH>FAILED</TH><TH>INCON</TH><TH>SKIPPED</TH><TH>SEG FAULT</TH><TH>TC Timeout</TH><TH>Start</TH><TH>Stop</TH><TH>Duration</TH><TH>Details</TH></TR>
+{% for result in test_results|sort(attribute='testcase_name') %}
+<TR>
+   <TD >{{result.testcase_name}}</TD>
+   <TD align="right">{{result.tags}}</TD>
+   {% if result.testcase_verdict == "PASS" %}
+      <TD align="center" style="background-color:green">{{result.testcase_verdict}}</TD>
+   {% elif result.testcase_verdict == "FAIL" %}
+      <TD align="center" style="background-color:red">{{result.testcase_verdict}}</TD>
+   {% else %}
+      <TD align="center" style="background-color:orange">{{result.testcase_verdict}}</TD>
+   {% endif %}
+   <TD align='center'>{{result.nruns}}</TD>
+   <TD align='center'>{{result.nb_run_pass}}</TD>
+   <TD align='center'>{{result.nb_run_failed}}</TD>
+   <TD align='center'>{{result.nb_run_inc}}</TD>  
+   <TD align='center'>{{result.nb_run_skip}}</TD>  
+   <TD align='center'>{{result.nb_seg_fault}}</TD>  
+   <TD >{{result.testcase_timeout}}</TD>
+   <TD >{{result.testcase_time_start.strftime('%Y-%m-%d %H:%M:%S')}}</TD>
+   <TD >{{result.testcase_time_stop.strftime('%Y-%m-%d %H:%M:%S')}}</TD>
+   <TD >{{result.testcase_duration}}</TD>
+   <TD ><a href="{{ result.testcase_name }}/{{ result.testcase_name }}_report.html">{{ result.testcase_name }}_report.html</a></TD>  
+</TR>
+{% endfor %}
+</table>
+
+
+<br></br>
+<h3>UE phy-test stability tests results</h3>
+<h4>Objectives</h4>
+<p>To be complete</p>
+<h4>Results</h4>
+To be complete
+
+</table>
+</body>
+</html>
+

cmake_targets/autotests/templates/testcase_report.html

@@ -0,0 +1,142 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8"/>
+    <title>OAI5G UE test case report</title>
+    <script type="text/javascript">
+    function showhide(id) {
+      var e = document.getElementById(id);
+     e.style.display = (e.style.display == 'block') ? 'none' : 'block';
+    }
+</script>
+</head>
+<style>
+table, th, td {
+    border: 1px solid black;
+    border-collapse: collapse;
+    padding: 5px;
+}
+</style>
+<body>
+<center>
+<h2>OAI5G UE test case report details</h2>
+</center>
+
+<h3>Test Case description</h3>
+<p>
+  <table border>
+
+    <tr><td>ID</td><td>{{testcase_name}}</td></tr>
+    <tr><td>TAG</td><td>{{tags}}</td></tr>
+    <tr><td>class</td><td>{{testcaseclass}}</td></tr>
+    <tr><td>description</td><td></td></tr>
+    <tr><td>timeout</td><td>{{testcase_timeout}}</td></tr>
+    <tr><td>number of runs</td><td>{{nruns}}</td></tr>
+    <tr><td>eNB machine</td><td>{{testcase_eNBMachine}}</td></tr>
+    <tr><td>UE machine</td><td>{{testcase_UEMachine}}</td></tr>
+
+  </table>
+</p>
+
+
+<h3>Test Case execution</h3>
+<p>
+  <table border>
+
+    <tr><td>testcase_time_start</td><td>{{testcase_time_start}}</td></tr>
+    <tr><td>testcase_time_stop</td><td>{{testcase_time_stop}}</td></tr>
+    <tr><td>testcase_duration</td><td>{{testcase_duration}}</td></tr>
+    <tr><td>Nb runs</td><td>{{nruns}}</td></tr>
+    <tr><td>Nb PASS</td><td>{{nb_run_pass}}</td></tr>
+    <tr><td>Nb FAILED</td><td>{{nb_run_failed}}</td></tr>
+    <tr><td>Nb INCONCLUSIVE</td><td>{{nb_run_inc}}</td></tr>
+    <tr>
+    <td>testcase_verdict</td>
+     {% if testcase_verdict == "PASS" %}
+        <TD align="center" style="background-color:green">{{testcase_verdict}}</TD>
+     {% elif testcase_verdict == "FAIL" %}
+        <TD align="center" style="background-color:red">{{testcase_verdict}}</TD>
+     {% else %}
+        <TD align="center" style="background-color:orange">{{testcase_verdict}}</TD>
+     {% endif %}
+    </tr>
+    <tr><td>Nb Seg Fault</td><td>{{nb_seg_fault}}</td></tr>
+
+  </table>
+</p>
+
+
+
+<h3>Test Case runs results</h3>
+
+{% for run_results in runs_results|sort(attribute='run_id') %}
+<h4>RUN {{run_results.run_id}} </h4>
+	<table border>
+		<tr><td>run_start_time </td><td>{{run_results.run_start_time}}</td></tr>
+    <tr><td>run_stop_time</td><td>{{run_results.run_stop_time}}</td></tr>
+    <tr><td>run_duration</td><td>{{run_results.run_duration}}</td></tr>
+		<tr>
+      <td>run_verdict</td>
+       {% if run_results.run_verdict == "PASS" %}
+          <TD align="center" style="background-color:green">{{run_results.run_verdict}}</TD>
+       {% elif run_results.run_verdict == "FAIL" %}
+          <TD align="center" style="background-color:red">{{run_results.run_verdict}}</TD>
+       {% else %}
+          <TD align="center" style="background-color:orange">{{run_results.run_verdict}}</TD>
+       {% endif %}
+    </tr>
+    <tr><td>Seg Fault Satus</td>
+      {% if run_results.ue_seg_fault_status == "NO_SEG_FAULT" %}
+        <TD align="center" style="background-color:green">{{run_results.ue_seg_fault_status}}</TD>
+      {% elif run_results.ue_seg_fault_status == "SEG_FAULT" %}
+        <TD align="center" style="background-color:red">{{run_results.ue_seg_fault_status}}</TD>
+      {% else %}
+          <TD align="center" style="background-color:orange">unknown</TD>
+       {% endif %}
+    </tr>
+	</table>
+
+	{% for run_metrics in run_results.runs_metrics %}
+	<br></br>
+	<table border>
+    <tr><td>metric_id</td><td>{{run_metrics.metric_id}}</td></tr>
+    <tr><td>Description</td><td>{{run_metrics.metric_desc}}</td></tr>
+    <tr><td>Unit of measure</td><td>{{run_metrics.metric_uom}}</td></tr>    
+		<tr><td>metric_min</td><td>{{run_metrics.metric_min}}</td></tr>
+		<tr><td>metric_max</td><td>{{run_metrics.metric_max}}</td></tr>
+		<tr><td>metric_mean</td><td>{{run_metrics.metric_mean}}</td></tr>
+		<tr><td>metric_median</td><td>{{run_metrics.metric_median}}</td></tr>
+    <tr><td colspan="2"></td></tr>
+    {% if run_metrics.pass_fail_stat is defined %}
+      <tr><td>Pass/fail stat</td><td>{{run_metrics.pass_fail_stat}}</td></tr>
+    {% endif %}
+    {% if run_metrics.pass_fail_min_limit is defined %}
+       <tr><td>Pass/fail min limit</td><td>{{run_metrics.pass_fail_min_limit}}</td></tr>
+    {% endif %}
+    {% if run_metrics.pass_fail_max_limit is defined %}
+      <tr><td>Pass/fail max limit</td><td>{{run_metrics.pass_fail_max_limit}}</td></tr>    
+    {% endif %}
+    <tr><td colspan="2"></td></tr>
+		<tr><td>metric_fig</td><td><IMG src={{run_metrics.metric_fig}}></td></tr>
+	</table>
+
+	{% endfor %}
+
+  {% if run_results.run_traffic.traffic_count != 0 %}
+  <br></br>
+  <table border>
+    <TR><TH>Iperf metric</TH><TH>min</TH><TH>max</TH><TH>mean</TH><TH>median</TH><TR>
+    <TR><td>Bandwidth </td><td>{{run_results.run_traffic.bw_min}}</td><td>{{run_results.run_traffic.bw_max}}</td><td>{{run_results.run_traffic.bw_mean}}</td><td>{{run_results.run_traffic.bw_median}}</td><TR>
+    <TR><td>Jitter</td><td>{{run_results.run_traffic.jitter_min}}</td><td>{{run_results.run_traffic.jitter_max}}</td><td>{{run_results.run_traffic.jitter_mean}}</td><td>{{run_results.run_traffic.jitter_median}}</td><TR>
+    <TR><td>Loss rate</td><td>{{run_results.run_traffic.rl_min}}</td><td>{{run_results.run_traffic.rl_max}}</td><td>{{run_results.run_traffic.rl_mean}}</td><td>{{run_results.run_traffic.rl_median}}</td><TR> 
+    <TR><td colspan="5"></td></TR>
+    <TR><td>Iperf duration</td><td>{{run_results.run_traffic.iperf_duration}}</td><td></td><td>Pass/Fail criteria (min duration)</td><td>{{run_results.run_traffic.dur_pass_fail_crit}}</td><TR> 
+    <TR><td colspan="5"></td></TR>
+    <tr><td>traffic_fig</td><td colspan="4"><IMG src={{run_results.run_traffic.traffic_fig}}></td></tr>
+  </table>
+  {% endif %}
+
+{% endfor %}
+
+</body>
+</html>

cmake_targets/autotests/tools/autotest_analyser.py

@@ -0,0 +1,174 @@
+#! /usr/bin/python
+#******************************************************************************
+#
+# \file		autotest_analyser.py
+#
+# \par     Informations
+#            - \b Project  : UED Autotest Framework
+#            - \b Software : 
+#
+# \date		16 september 2016
+#
+# \version	0.1
+#
+# \brief	helper to test lib_autotest_analyser.py
+#
+# \author	Benoit ROBERT (benoit.robert@syrtem.com)
+#
+# \par		Statement of Ownership
+#           COPYRIGHT (c) 2016  BY SYRTEM S.A.R.L
+#           This software is furnished under license and may be used and copied 
+#			only in accordance with the terms of such license and with the inclusion
+#			of the above COPYRIGHT notice. This SOFTWARE or any other copies thereof
+#			may not be provided or otherwise made available to any other person. 
+#			No title to and ownership of the SOFTWARE is hereby transferred.
+#
+#			The information in this SOFTWARE is subject to change without notice 
+#			and should not be constructed as a commitment by SYRTEM.
+#           SYRTEM assumes no responsibility for the use or reliability of its 
+#			SOFTWARE on equipment or platform not explicitly validated by SYRTEM.
+#
+# *******************************************************************************
+
+import os
+import getopt
+import sys
+from subprocess import call
+
+import encoder
+
+sys.path.append(os.path.expandvars('$OPENAIR_DIR/cmake_targets/autotests/tools/'))
+
+
+#test_cases = ('030001', '030901', '031001', '031601', '031701', '031801', '031901', '032001', '032101', '032201', '032301', '032501', '032601', '032801')
+test_cases = ('032800' , '032730' ) 
+
+nb_run = 2
+
+def error_opt(msg):
+    print("Option error: " + msg)
+
+
+def main(args):
+	try:
+		analyser = __import__("lib_autotest_analyser")
+	except ImportError as err:
+		print('Import error: ' + str(err))
+		exit(0)
+
+
+	log_path = 'log_save_2016-08-14/log/'
+
+
+
+	# metric = {}
+	# metric['id'] 			= 'UE_DLSCH_BITRATE'
+	# metric['description'] 	= 'UE downlink physical throughput'	
+	# metric['regex'] 		= '(UE_DLSCH_BITRATE) =\s+(\d+\.\d+) kbps.+frame = (\d+)\)'
+	# metric['unit_of_meas']	= 'kbps'
+	# metric['min_limit']		= 14668.8
+
+
+#AUTOTEST Metric : RRC Measurments RSRP[0]=-97.60 dBm/RE, RSSI=-72.83 dBm, RSRQ[0] 9.03 dB, N0 -125 dBm/RE, NF 7.2 dB (frame = 4490)
+
+	metric = {}
+	metric['id'] 		= 'UE_DL_RRC_MEAS'
+	metric['description'] 	= 'UE downlink RRC Measurments'	
+	metric['nb_metric']	= 5
+#	metric['regex'] 	= 'AUTOTEST Metric : RRC Measurments (RSRP\[0\])=(-?\d+\.?\d*)\s+(.+),\s+(RSRQ\[0\])=(-?\d+\.?\d*)\s+(.+),,\s+(N0)=(-?\d+\.?\d*)\s+(.+),,\s+(NF)=(-?\d+\.?\d*)\s+(.+)\s+\(frame = (\d+)\) '
+	metric['regex'] 	= 'AUTOTEST Metric : RRC Measurments (RSRP\[0\])=(-?\d+\.?\d*)\s+(.+)\,\s+(RSSI)=(-?\d+\.?\d*)\s+(.+)\,\s+(RSRQ\[0\])=(-?\d+\.?\d*)\s+(.+)\,\s+(N0)=(-?\d+\.?\d*)\s+(.+)\,\s+(NF)=(-?\d+\.?\d*)\s+(.+)\s+\(frame = (\d+)\)'
+	metric['unit_of_meas']	= 'kbps'
+	metric['min_limit']		= 14668.8
+
+
+
+#report_path = log_path+'/report/'
+
+#os.system(' mkdir -p ' + report_path)
+
+#analyser.create_report_html(report_path)
+
+#return(0)
+
+	test_results = []
+
+	for test_case in test_cases:
+
+		for i in range(0, nb_run):
+			fname = '..//log//'+test_case+'/run_'+str(i)+'/UE_exec_'+str(i)+'_.log'
+			args = {'metric' : metric,
+					'file' : fname }
+
+			# cell_synch_status = analyser.check_cell_synchro(fname)
+			# if cell_synch_status == 'CELL_SYNCH':
+			#   print '!!!!!!!!!!!!!!  Cell synchronized !!!!!!!!!!!'
+			#   metric_checks_flag = 0
+			# else :
+			#   print '!!!!!!!!!!!!!!  Cell NOT  NOT synchronized !!!!!!!!!!!'
+	
+#			metrics_extracted = analyser.do_extract_metrics_new(args)
+
+
+			# de-xmlfy test report
+			xml_file = '..//log//'+test_case+'/test.'+test_case+'_ng.xml'
+			print xml_file
+
+		# 	test_result =
+
+
+  # 			test_results.append(test_result)
+
+  # xmlFile = logdir_local_testcase + '/test.' + testcasename + '.xml'
+  # xml="\n<testcase classname=\'"+ testcaseclass +  "\' name=\'" + testcasename + "."+tags +  "\' Run_result=\'" + test_result_string + "\' time=\'" + str(duration) + " s \' RESULT=\'" + testcase_verdict + "\'></testcase> \n"
+  # write_file(xmlFile, xml, mode="w")
+
+  # xmlFile_ng = logdir_local_testcase + '/test.' + testcasename + '_ng.xml'
+  # xml_ng = xmlify(test_result, wrap=testcasename, indent="  ")
+  # write_file(xmlFile_ng, xml_ng, mode="w")
+
+
+
+
+#			print "min       = "+ str( metric_extracted['metric_min'] )
+#			print "min_index = "+ str( metric_extracted['metric_min_index'] )
+#			print "max       = "+ str( metric_extracted['metric_max'] )
+#			print "max_index = "+ str( metric_extracted['metric_max_index'] )
+#			print "mean      = "+ str( metric_extracted['metric_mean'] )
+#			print "median    = "+ str( metric_extracted['metric_median'] )			
+
+#			verdict = analyser.do_check_verdict(metric, metric_extracted)
+#			print verdict
+
+#			fname= 'report/2016-9-8_toto/'+test_case+'/UE_metric_UE_DLSCH_BITRATE_'+str(i)+'_.png'
+#			fname= 'report/UE_metric_UE_DLSCH_BITRATE_'+test_case+'_'+str(i)+'.png'
+			
+#			print fname
+#			analyser.do_img_metrics(metric, metric_extracted, fname)
+
+			# fname = 'log//'+test_case+'/run_'+str(i)+'/UE_traffic_'+str(i)+'_.log'
+			
+			# args = {'file' : fname }
+
+			# traffic_metrics = analyser.do_extract_traffic_metrics(args)
+
+			# fname= 'report/iperf_'+test_case+'_'+str(i)+'.png'
+			
+			# print fname
+			# analyser.do_img_traffic(traffic_metrics, fname)
+
+
+	for test_result in test_results:
+	  cmd = 'mkdir -p ' + report_dir + '/'+ test_result['testcase_name']
+	  result = os.system(cmd)
+
+	  report_file = report_dir + '/'+ test_result['testcase_name'] + '/'+ test_result['testcase_name']+ '_report.html'
+
+	  analyser.create_test_report_detailed_html(test_result, report_file )
+
+	  print test_result
+
+
+
+if __name__ == "__main__":
+    main(sys.argv)
+

cmake_targets/autotests/tools/configure_cots_bandrich_ue.py

@@ -1,33 +1,25 @@
 #!/usr/bin/python 
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 import time

cmake_targets/autotests/tools/configure_cots_huaweiE398_ue.py

@@ -1,33 +1,25 @@
 #!/usr/bin/python 
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 import time

cmake_targets/autotests/tools/configure_cots_sony_experia_m4_ue.py

@@ -1,4 +1,26 @@
 #!/usr/bin/python 
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+# \author Navid Nikaein, Rohit Gupta
 
 import time
 import serial

cmake_targets/autotests/tools/configure_usrpb210.py

@@ -1,33 +1,25 @@
 #!/usr/bin/python 
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 import time

cmake_targets/autotests/tools/find_usb_path.bash

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 

cmake_targets/autotests/tools/free_mem.bash

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 # To free unused memory else test setup runs out of memory

cmake_targets/autotests/tools/git-retry.sh

@@ -1,4 +1,26 @@
 #!/bin/bash
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+# \author Navid Nikaein, Rohit Gupta
 
 #Simple script to retry git clone in case of failure
 

cmake_targets/autotests/tools/iperf3_script

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 #arg1 timeout to wait before running the script

cmake_targets/autotests/tools/iperf3_script_phone

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 #arg1 timeout to wait before running the script

cmake_targets/autotests/tools/iperf_script

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 #arg1 timeout to wait before running the script

cmake_targets/autotests/tools/iperf_script_phone

@@ -1,33 +1,25 @@
 #!/bin/bash
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 #arg1 timeout to wait before running the script

cmake_targets/autotests/tools/lib_autotest.py

@@ -1,33 +1,25 @@
 #!/usr/bin/python
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 import os

cmake_targets/autotests/tools/lib_autotest_analyser.py

@@ -0,0 +1,544 @@
+#******************************************************************************
+#
+# \file		lib_autotest_analyser.py
+#
+# \par     Informations
+#            - \b Project  : UED Autotest Framework
+#            - \b Software : 
+#
+# \date		16 september 2016
+#
+# \version	0.1
+#
+# \brief	library to extract metrics from autotest logs and assign a verdict
+#
+# \author	Benoit ROBERT (benoit.robert@syrtem.com)
+#
+# \par		Statement of Ownership
+#           COPYRIGHT (c) 2016  BY SYRTEM S.A.R.L
+#           This software is furnished under license and may be used and copied 
+#			only in accordance with the terms of such license and with the inclusion
+#			of the above COPYRIGHT notice. This SOFTWARE or any other copies thereof
+#			may not be provided or otherwise made available to any other person. 
+#			No title to and ownership of the SOFTWARE is hereby transferred.
+#
+#			The information in this SOFTWARE is subject to change without notice 
+#			and should not be constructed as a commitment by SYRTEM.
+#           SYRTEM assumes no responsibility for the use or reliability of its 
+#			SOFTWARE on equipment or platform not explicitly validated by SYRTEM.
+#
+# *******************************************************************************
+
+
+import re
+from pylab import *
+from matplotlib.font_manager import FontProperties
+
+import os
+from jinja2 import Environment, FileSystemLoader
+
+
+PATH = os.path.dirname(os.path.abspath(__file__))
+TEMPLATE_ENVIRONMENT = Environment(
+    autoescape=False,
+    loader=FileSystemLoader(os.path.join(PATH, '../templates')),
+    trim_blocks=False)
+
+
+def render_template(template_filename, context):
+    return TEMPLATE_ENVIRONMENT.get_template(template_filename).render(context)
+
+
+
+def init(args = None):
+    return
+
+
+#
+#
+#
+def do_extract_metrics(args):
+
+#	print ""
+#	print "do_extract_metrics ... "
+
+	fname 	= args['file']
+	metric 	= args['metric']
+#	print(fname)
+#	print 'metric id = ' + metric['id']
+#	print 'metric regex = ' + metric['regex']
+
+	count 		= 0
+	mmin 		= 0
+	mmin_index 	= 0
+	mmax  		= 0
+	mmax_index 	= 0
+	mean 		= 0
+	median 		= 0
+	
+
+	output = np.fromregex(fname,metric['regex'], [('id', 'S20'), ('metric', np.float), ('frame', np.int)] )
+#	print 'T0T0 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+#	print output
+	count =  output['metric'].size
+#	print count
+	if count > 0:
+		mmin  		= np.amin(output['metric']);
+		mmin_index 	= np.argmin(output['metric']);
+		mmax  		= np.amax(output['metric']);
+		mmax_index 	= np.argmax(output['metric']); 			
+		mean 		= np.mean(output['metric']);
+		median 		= np.median(output['metric']);
+
+#		print ( ( (metric['min_limit'] > output['metric']).sum() / float(output['metric'].size) ) * 100 )
+
+	ret = {	'metric_count'		: count,
+			'metric_buf' 		: output,
+		 	'metric_min' 		: mmin, 
+		 	'metric_min_index' 	: mmin_index,
+			'metric_max' 		: mmax,
+		 	'metric_max_index' 	: mmax_index,
+			'metric_mean' 		: mean,
+			'metric_median' 	: median,
+			}
+	return(ret)
+
+
+def do_extract_metrics_new(args):
+
+#	print ""
+#	print "do_extract_metrics ... "
+
+	fname 	= args['file']
+	metric 	= args['metric']
+	print(fname)
+	print 'metric id = ' + metric['id']
+	print 'metric regex = ' + metric['regex']
+
+
+
+	count 		= 0
+	mmin 		= 0
+	mmin_index 	= 0
+	mmax  		= 0
+	mmax_index 	= 0
+	mean 		= 0
+	median 		= 0
+	
+	toto = [('id', 'S20'), ('metric', np.float), ('frame', np.int)]
+	print toto
+
+
+	np_format = []
+
+	for x in range(0, metric['nb_metric']):
+	 	np_format.append( ('id'+str(x), 'S20') )
+	 	np_format.append( ('metric'+str(x), np.float) )
+	 	np_format.append( ('uom'+str(x), 'S20') )
+	np_format.append( ('frame', np.int)) 
+
+	print np_format
+
+	output = np.fromregex(fname,metric['regex'], np_format)
+	print output
+	count =  output['frame'].size
+	print count
+	if count > 0:
+
+
+		fontP = FontProperties()
+		fontP.set_size('small')
+
+		fig = plt.figure(1)
+		plt.figure(figsize=(10,10))
+
+		plot_xmax = np.amax(output['frame'])+np.amin(output['frame'])
+
+		for x in range(0, metric['nb_metric']):	
+
+			metric_name = output['id'+str(x)][0]
+			metric_uom = output['uom'+str(x)][0]
+
+			mmin 	= np.amin(output['metric'+str(x)])
+			mmax 	= np.amax(output['metric'+str(x)])
+			mmean 	= np.mean(output['metric'+str(x)])
+			mmedian = np.median(output['metric'+str(x)])
+
+			plot_loc = 100*metric['nb_metric']+10+x+1
+
+			sbplt = plt.subplot(plot_loc)
+			sbplt.plot(output['frame'], output['metric'+str(x)], color='b' )
+			sbplt.set_title( metric_name+' ('+metric_uom+')')
+			if mmin < 0:
+				sbplot_ymin=mmin+mmin/10
+			else:
+				sbplot_ymin=0
+			sbplt.set_ylim(ymin=sbplot_ymin)	
+			if mmax > 0:
+				sbplot_ymax=mmax+mmax/10
+			else:
+				sbplot_ymax=0
+			sbplt.set_ylim(ymax=sbplot_ymax)
+
+			sbplt.set_xlim(xmax=plot_xmax)
+			sbplt.set_xlim(xmin=0)
+			text='min: '+str(mmin)+'\nmax: '+str(mmax)+'\nmean: '+str(mmean)+'\nmedian: '+str(mmedian)
+			sbplt.text( plot_xmax+10,sbplot_ymin,text)
+			sbplt.set_xlabel('frame')
+			sbplt.set_ylabel(metric_name)
+
+		plt.tight_layout()
+
+		fname = "toto.png"
+
+#		lgd = plt.legend(prop=fontP, bbox_to_anchor=(1.05, 1), loc=2, borderaxespad=0.)
+		mng = plt.get_current_fig_manager()
+		plt.savefig(fname, bbox_inches='tight')
+		plt.close()
+
+
+
+
+
+
+
+
+
+		mmin  		= np.amin(output['metric']);
+		mmin_index 	= np.argmin(output['metric']);
+		mmax  		= np.amax(output['metric']);
+		mmax_index 	= np.argmax(output['metric']); 			
+		mean 		= np.mean(output['metric']);
+		median 		= np.median(output['metric']);
+
+#		print ( ( (metric['min_limit'] > output['metric']).sum() / float(output['metric'].size) ) * 100 )
+
+	ret = {	'metric_count'		: count,
+		'metric_buf' 		: output,
+		
+
+		'metric_min' 		: mmin, 
+		'metric_min_index' 	: mmin_index,
+		'metric_max' 		: mmax,
+		'metric_max_index' 	: mmax_index,
+		'metric_mean' 		: mean,
+		'metric_median' 	: median,
+		}
+	return(ret)
+
+#
+#
+#
+def do_check_verdict(metric_def, metric_data):
+	verdict = 'INCON'
+
+	pass_fail_stat = metric_def['pass_fail_stat']
+
+	if pass_fail_stat == 'max_value':
+		metric_stat = metric_data['metric_max']
+	elif pass_fail_stat == 'min_value':
+		metric_stat = metric_data['metric_min']
+	elif pass_fail_stat == 'mean_value':
+		metric_stat = metric_data['metric_mean']
+	elif pass_fail_stat == 'median_value':
+		metric_stat = metric_data['metric_median']
+	else :
+		print "do_check_verdict -> undef metric stat (pass_fail_stat in xml file)"
+		return verdict
+
+	if 'max_limit' in metric_def:
+		if  metric_stat > metric_def['max_limit']:
+			verdict =  'FAIL'
+		else:
+			verdict = 'PASS'
+
+	if 'min_limit' in metric_def:
+		if metric_stat < metric_def['min_limit']:
+			verdict = 'FAIL'
+		else:
+			verdict = 'PASS'
+	return verdict
+
+
+def do_print_metrics(metric_def, metric_data):
+
+
+	if metric_data['metric_count'] > 0 :
+
+#		output = np.array( metric_data['metric_buf'] , [('id', 'S20'), ('metric', np.float), ('frame', np.int)])
+		output = metric_data['metric_buf']
+#		print output
+
+		fontP = FontProperties()
+		fontP.set_size('small')
+
+		plt.scatter(output['frame'], output['metric'], color='b', alpha=0.33, s = 1 )
+		plt.plot([0, output['frame'][metric_data['metric_count']-1]],[ metric_def['min_limit'],metric_def['min_limit']], 'r-', lw=2) # Red straight line
+
+		plt.title('Physical throughput ')
+		plt.xlabel('frame')
+		plt.ylabel(metric_def['id'])
+		plt.legend(prop=fontP)
+		mng = plt.get_current_fig_manager()
+		plt.show()
+
+def do_img_metrics(metric_def, metric_data, fname):
+
+
+	if metric_data['metric_count'] > 0 :
+
+#		output = np.array( metric_data['metric_buf'] , [('id', 'S20'), ('metric', np.float), ('frame', np.int)])
+		output = metric_data['metric_buf']
+#		print 'TITI !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!'
+#		print output
+
+#		print metric_def['min_limit']
+#		print metric_data['metric_count']
+#		print output['frame'][metric_data['metric_count']-1]
+
+		fontP = FontProperties()
+		fontP.set_size('small')
+
+		plt.figure()
+
+#		print output['frame'].size
+#		print output['metric'].size
+
+		plt.scatter(output['frame'], output['metric'], color='b', alpha=0.33, s = 1 , label=metric_def['id'])
+		
+		if 'min_limit' in metric_def:
+			plt.plot([0, output['frame'][metric_data['metric_count']-1]],[ metric_def['min_limit'],metric_def['min_limit']], 'r-', lw=2, label='min limit') # Red straight line
+
+		plt.title(metric_def['id'] +' ('+metric_def['unit_of_meas']+')')
+		plt.xlabel('frame')
+		plt.ylabel(metric_def['id'])
+		
+		# Set graphic minimum Y axis
+		# -------------------------
+		if metric_data['metric_min'] < 0:
+			plt.ylim(ymin=metric_data['metric_min']+metric_data['metric_min']/10)
+		else :	
+			plt.ylim(ymin=0)
+
+		y_axis_max = 0
+		if 'min_limit' in metric_def:
+			if metric_data['metric_max'] >  metric_def['min_limit']:
+				y_axis_max =metric_data['metric_max']+metric_data['metric_max']/10
+			else:
+				y_axis_max =metric_def['min_limit']+metric_def['min_limit']/10
+		else:
+			y_axis_max =metric_data['metric_max']+metric_data['metric_max']/10
+
+
+		plt.ylim(ymax=y_axis_max)
+
+		lgd = plt.legend(prop=fontP, bbox_to_anchor=(1.05, 1), loc=2, borderaxespad=0.)
+		mng = plt.get_current_fig_manager()
+		plt.savefig(fname, bbox_extra_artists=(lgd,), bbox_inches='tight')
+		plt.close()
+
+#	with open(fname, 'r') as f:
+#		for line in f:
+#			m = re.search(metric['regex'], line)
+#			if m :
+#				print m.group(1) + " -> "+m.group(2)
+
+
+
+
+def do_extract_traffic_metrics(args):
+
+	fname 	= args['file']
+
+#	print(fname)
+#	print 'metric id = ' + metric['id']
+
+#[ ID] Interval       Transfer     Bandwidth        Jitter   Lost/Total Datagrams
+#[  3]  0.0- 1.0 sec   238 KBytes  1.95 Mbits/sec   0.980 ms    2/  174 (1.1%)
+# [  3]  0.0- 1.0 sec  63.2 KBytes   517 Kbits/sec   0.146 ms    1/   45 (2.2%)
+
+#	iperf_regex = '[\s*(\d+)]\s+\d+\.\d+-\s*(\d+\.\d+)\s+sec\s+(\d+).+(\d+\.\d+).+(\d+\.\d+).+(\d+)\/\s*(\d+)\s+\((\d+\.\d+)\%\)'
+	#                    ID          0.0            1.0                 63.2        KByte   517          Kbits/s   0.146
+	iperf_regex = '\[\s*(\d+)\]\s+(\d+\.*\d*)-\s*(\d+\.*\d*)\s+sec\s+(\d+\.*\d*)\s+(\D+)\s+(\d+\.*\d*)\s+(\D+)\s+(\d+\.*\d*)\s+ms\s+(\d+)\/\s*(\d+)\s+\((\d+\.*\d*)\%\)'
+#	print 'iperf regex = ' + iperf_regex
+
+	count 		= 0
+	bw_min 		= 0
+	bw_max 		= 0
+	bw_mean 	= 0
+	bw_median	= 0
+	jitter_min 		= 0
+	jitter_max 		= 0
+	jitter_mean 	= 0
+	jitter_median	= 0
+
+	rl_min 		= 0
+	rl_max 		= 0
+	rl_mean 	= 0
+	rl_median	= 0
+
+	interval_stop_max = 0
+	
+	output = np.fromregex(fname,iperf_regex, [('id', np.int) , ('interval_start', np.float), ('interval_stop', np.float), ('transfer', np.float), ('transfer_uom', 'S20') ,('bandwidth', np.float), ('bandwidth_uom', 'S20') ,('jitter', np.float), ('lost', np.int) , ('total', np.int), ('rate_lost', np.float) ] )
+
+	count = output['id'].size -1
+	# remove last line that is an iperf result resume
+
+	if count > 0:
+
+		output= np.delete(output, (count), axis=0 )
+#		print output
+
+		bw_min 		= np.amin(output['bandwidth']);
+		bw_max 		= np.amax(output['bandwidth']);
+		bw_mean 	= np.mean(output['bandwidth']);
+		bw_median	= np.median(output['bandwidth']);
+
+		jitter_min 		= np.amin(output['jitter']);
+		jitter_max 		= np.amax(output['jitter']);
+		jitter_mean 	= np.mean(output['jitter']);
+		jitter_median	= np.median(output['jitter']);
+
+		rl_min 		= np.amin(output['rate_lost']);
+		rl_max 		= np.amax(output['rate_lost']);
+		rl_mean 	= np.mean(output['rate_lost']);
+		rl_median	= np.median(output['rate_lost']);
+
+		interval_stop_max = np.amax(output['interval_stop']);
+
+	else :
+		count = 0
+
+
+	ret = {	'traffic_count'	: count,
+			'traffic_buf' 	: output,
+			'bw_min' 		: bw_min,
+			'bw_max' 		: bw_max,
+			'bw_mean' 		: bw_mean,
+			'bw_median'		: bw_median,
+			'jitter_min' 	: jitter_min,
+			'jitter_max' 	: jitter_max,
+			'jitter_mean' 	: jitter_mean,
+			'jitter_median'	: jitter_median,
+			'rl_min' 		: rl_min,
+			'rl_max' 		: rl_max,
+			'rl_mean' 		: rl_mean,
+			'rl_median'		: rl_median,
+			'interval_stop_max' : interval_stop_max
+			}
+	return(ret)
+
+
+
+
+def do_img_traffic(traffic_data, fname):
+
+
+	if traffic_data['traffic_count'] > 0 :
+
+		output = traffic_data['traffic_buf']
+
+
+		fontP = FontProperties()
+		fontP.set_size('small')
+
+		fig = plt.figure(1)
+
+		ax1= plt.subplot(311)
+		plt.plot(output['interval_stop'], output['bandwidth'], color='b' )
+		ax1.set_title('Bandwidth (Mbits/s)')
+		ax1.set_ylim(ymin=-1)
+		ax1.set_xlim(xmax=np.amax(output['interval_stop']))
+		text='min: '+str(traffic_data['bw_min'])+'\nmax: '+str(traffic_data['bw_max'])+'\nmean: '+str(traffic_data['bw_mean'])+'\nmedian: '+str(traffic_data['bw_median'])
+		ax1.text( np.amax(output['interval_stop'])+10,0,text)
+		ax1.set_xlabel('time (s)')
+		ax1.set_ylabel(' ')
+
+		ax2=plt.subplot(312)
+		plt.plot(output['interval_stop'], output['jitter'], color='b' )
+		ax2.set_title('Jitter (ms)')
+		ax2.set_xlim(xmax=np.amax(output['interval_stop']))
+		ax2.set_ylim(ymin=-1)
+		text='min: '+str(traffic_data['jitter_min'])+'\nmax: '+str(traffic_data['jitter_max'])+'\nmean: '+str(traffic_data['jitter_mean'])+'\nmedian: '+str(traffic_data['jitter_median'])
+		ax2.text( np.amax(output['interval_stop'])+10,0,text)
+		ax2.set_xlabel('time (s)')
+		ax2.set_ylabel(' ')
+
+		ax3=plt.subplot(313)
+		plt.plot(output['interval_stop'], output['rate_lost'], color='b')
+		ax3.set_title('Loss rate %')
+		ax3.set_xlim(xmax=np.amax(output['interval_stop']))
+		ax3.set_ylim(ymin=-1)
+		text='min: '+str(traffic_data['rl_min'])+'\nmax: '+str(traffic_data['rl_max'])+'\nmean: '+str(traffic_data['rl_mean'])+'\nmedian: '+str(traffic_data['rl_median'])
+		ax3.text( np.amax(output['interval_stop'])+10,0,text)
+		ax3.set_xlabel('time (s)')
+		ax3.set_ylabel(' ')
+
+#		plt.title('Physical throughput ('+metric_def['unit_of_meas']+')')
+#		plt.xlabel('time (s)')
+#		plt.ylabel(metric_def['id'])
+		
+		# Set graphic minimum Y axis
+		# -------------------------
+#		if traffic_data['bw_min'] == 0 :
+#			plt.ylim(ymin=-metric_def['min_limit']/10)
+#		else :	
+#			plt.ylim(ymin=0)
+
+#		y_axis_max = 0
+#		if traffic_data['metric_max'] >  metric_def['min_limit']:
+#			y_axis_max =traffic_data['metric_max']+traffic_data['metric_max']/10
+#		else:
+#			y_axis_max =metric_def['min_limit']+metric_def['min_limit']/10
+#
+#		plt.ylim(ymax=y_axis_max)
+
+		plt.tight_layout()
+
+#		lgd = plt.legend(prop=fontP, bbox_to_anchor=(1.05, 1), loc=2, borderaxespad=0.)
+		mng = plt.get_current_fig_manager()
+		plt.savefig(fname, bbox_inches='tight')
+		plt.close()
+
+
+
+
+def create_report_html(context):
+    fname = context['report_path']+"/index.html"
+  
+    #
+    with open(fname, 'w') as f:
+        html = render_template('index.html', context)
+        f.write(html)
+
+
+def create_test_report_detailed_html(context, fname ):
+    with open(fname, 'w') as f:
+        html = render_template('testcase_report.html', context)
+        f.write(html)
+
+
+def check_cell_synchro(fname):	
+
+	with open(fname, 'r') as f:
+		for line in f:
+
+			m = re.search('AUTOTEST Cell Sync \:', line)
+			if m :
+				#print line
+				return 'CELL_SYNCH'
+
+	return 'CELL_NOT_SYNCH'
+
+
+def check_exec_seg_fault(fname):	
+
+	with open(fname, 'r') as f:
+		for line in f:
+			m = re.search('Segmentation fault', line)
+			if m :
+				#print line
+				return 'SEG_FAULT'
+
+	return 'NO_SEG_FAULT'
+

cmake_targets/autotests/tools/run_gdb

@@ -1,4 +1,27 @@
 #!/bin/bash
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+# \author Navid Nikaein, Rohit Gupta
+
 
 #arg0 -> Name of executable
 #args[1...N] -> arguments to be passed to executable

cmake_targets/autotests/tools/search_repl.py

@@ -1,33 +1,25 @@
 #!/usr/bin/python
-#******************************************************************************
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
 
-#    OpenAirInterface 
-#    Copyright(c) 1999 - 2014 Eurecom
-
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-
-
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-
-#   You should have received a copy of the GNU General Public License
-#   along with OpenAirInterface.The full GNU General Public License is 
-#   included in this distribution in the file called "COPYING". If not, 
-#   see <http://www.gnu.org/licenses/>.
-
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-  
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-
-# *******************************************************************************/
 # \author Navid Nikaein, Rohit Gupta
 
 import sys

cmake_targets/autotests/v2/actions/alu_epc.bash

@@ -0,0 +1,2 @@
+sudo /opt/ltebox/tools/stop_ltebox || true
+sudo /opt/ltebox/tools/start_ltebox

cmake_targets/autotests/v2/actions/alu_epc_stop.bash

@@ -0,0 +1 @@
+sudo /opt/ltebox/tools/stop_ltebox

cmake_targets/autotests/v2/actions/alu_hss.bash

@@ -0,0 +1,2 @@
+sudo /opt/ltebox/tools/stop_ltebox || true
+sudo /opt/hss_sim0609/starthss_real

cmake_targets/autotests/v2/actions/bandrich.txt

@@ -0,0 +1,136 @@
+The configuration for the bandrich in the test setup is a bit hackish.
+
+Here come some notes explaining what we do here.
+
+To get /dev/bandrich.data and /dev/bandrich.control (so that you don't need
+to look for which /dev/ttyUSBx are used by your dongle, and always use
+the same files, no matter what), add a udev file:
+
+    /etc/udev/rules.d/bandrich.rules
+
+containing lines:
+
+    SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="00", SYMLINK+="bandrich.data", MODE="0666"
+    SUBSYSTEM=="tty", ENV{ID_VENDOR_ID}=="1a8d", ENV{ID_MODEL_ID}=="100d", ENV{ID_SERIAL_SHORT}=="357473040068155", ENV{ID_USB_INTERFACE_NUM}=="02", SYMLINK+="bandrich.control", MODE="0666"
+
+Change vendor_id/model_id/serial/interface num to match yours.
+Use lsusb -v to find values.
+
+At first we used /dev/ttyUSB2 linked to /dev/bandrich for both data (in
+the wvdial configuration file) and control (in the python code, opening
+/dev/bandrich the standard unix way and read and write into it, with no
+special libusb commands).
+
+But it turned out that using /dev/ttyUSB2 for data gives bad throughput
+results. We tested downlink UDP at 15Mb/s but the maximum throughput for
+a 5MHz cell was around 13, and we had a lot of packets lost at the iperf's
+UDP level. Radio was looking fine (all packets acked correctly), so it was
+not a radio problem. The dongle in a windows machine was working fine,
+15Mbs/s. Using the wvdial configuration file from test setup v1 gave also
+good results. The only difference was the use of /dev/ttyUSB0 instead of
+/dev/ttyUSB2. Using /dev/ttyUSB0 solved the throughput issue.
+
+But using /dev/ttyUSB0 for control in the pyton code did not work. The
+output was incorrect.
+
+So we decided to have /dev/bandrich.data linked to /dev/ttyUSB0 for data
+(wvdial) and /dev/bandrich.control linked to /dev/ttyUSB2 for control
+(in python code).
+
+It may not be the correct way to go, but it seems to do the trick so far.
+
+Your device may need some other solution.
+
+Here, we get, as result of lsusb -v:
+
+    [SNIP]
+    Bus 003 Device 009: ID 1a8d:100d BandRich, Inc. 4G LTE adapter
+    Device Descriptor:
+      bLength                18
+      bDescriptorType         1
+      bcdUSB               2.00
+      bDeviceClass            0 (Defined at Interface level)
+      bDeviceSubClass         0 
+      bDeviceProtocol         0 
+      bMaxPacketSize0        64
+      idVendor           0x1a8d BandRich, Inc.
+      idProduct          0x100d 4G LTE adapter
+      bcdDevice            0.00
+      iManufacturer          10 BandRich, Inc.
+      iProduct                9 BandLuxe HSPA-LTE Adapter
+      iSerial                11 357473040068155
+    [SNIP]
+
+You can also run:
+
+    udevadm monitor
+
+and unplug/replug the dongle. It will print some information.
+
+The command:
+
+    udevadm info --export-db
+
+is also important to get the right identifier to put in ENV{}. (It also
+gives the correct value.)
+
+Here is extracted what we have for our dongle:
+
+    P: /devices/pci0000:00/0000:00:1a.0/usb3/3-1/3-1.2/3-1.2:1.2/ttyUSB2/tty/ttyUSB2
+    N: ttyUSB2
+    S: bandrich
+    S: serial/by-id/usb-BandRich__Inc._BandLuxe_HSPA-LTE_Adapter_357473040068155-if02-port0
+    S: serial/by-path/pci-0000:00:1a.0-usb-0:1.2:1.2-port0
+    E: DEVLINKS=/dev/bandrich /dev/serial/by-id/usb-BandRich__Inc._BandLuxe_HSPA-LTE_Adapter_357473040068155-if02-port0 /dev/serial/by-path/pci-0000:00:1a.0-usb-0:1.2:1.2-port0
+    E: DEVNAME=/dev/ttyUSB2
+    E: DEVPATH=/devices/pci0000:00/0000:00:1a.0/usb3/3-1/3-1.2/3-1.2:1.2/ttyUSB2/tty/ttyUSB2
+    E: ID_BUS=usb
+    E: ID_MM_CANDIDATE=1
+    E: ID_MODEL=BandLuxe_HSPA-LTE_Adapter
+    E: ID_MODEL_ENC=BandLuxe\x20HSPA-LTE\x20Adapter
+    E: ID_MODEL_FROM_DATABASE=4G LTE adapter
+    E: ID_MODEL_ID=100d
+    E: ID_PATH=pci-0000:00:1a.0-usb-0:1.2:1.2
+    E: ID_PATH_TAG=pci-0000_00_1a_0-usb-0_1_2_1_2
+    E: ID_REVISION=0000
+    E: ID_SERIAL=BandRich__Inc._BandLuxe_HSPA-LTE_Adapter_357473040068155
+    E: ID_SERIAL_SHORT=357473040068155
+    E: ID_TYPE=generic
+    E: ID_USB_DRIVER=option
+    E: ID_USB_INTERFACES=:ffffff:020600:0a0000:080650:
+    E: ID_USB_INTERFACE_NUM=02
+    E: ID_VENDOR=BandRich__Inc.
+    E: ID_VENDOR_ENC=BandRich\x2c\x20Inc.
+    E: ID_VENDOR_FROM_DATABASE=BandRich, Inc.
+    E: ID_VENDOR_ID=1a8d
+    E: MAJOR=188
+    E: MINOR=2
+    E: SUBSYSTEM=tty
+    E: USEC_INITIALIZED=672068596
+
+You can also run:
+
+    udevadm info -a -p /sys/bus/usb-serial/devices/ttyUSB0
+    udevadm info -a -p /sys/bus/usb-serial/devices/ttyUSB2
+
+Note: after creating the udev files, you need to unplug/replug your
+dongle for /dev/bandrich.data and /dev/bandrich.control to appear.
+
+Note: the mode 0666 is for everyone to access the dongle (no need for
+      root privileges). If you prefer you can set it to 0600 (only root)
+      or 0660 (root and group).
+
+Then you need to configure pppd, to get correct 'route' information when
+you run wvdial.
+
+The file /etc/ppp/peers/wvdial should have the following content:
+
+    noauth
+    name wvdial
+    usepeerdns
+    defaultroute
+    replacedefaultroute
+
+The file wvdial.bandrich.conf has been created by copying some information
+found on the Internet. Its content may not be fully correct. Adapt to your
+situation. It seems to work here.

cmake_targets/autotests/v2/actions/client_tcp.bash

@@ -0,0 +1,2 @@
+echo $SERVER_IP
+timeout -s 9 20s iperf -c $SERVER_IP -i1

cmake_targets/autotests/v2/actions/client_udp.bash

@@ -0,0 +1,3 @@
+echo $SERVER_IP
+echo $UDP_BANDWIDTH
+timeout -s 9 20s iperf -c $SERVER_IP -i1 -u -b $UDP_BANDWIDTH

cmake_targets/autotests/v2/actions/clone_repository.bash

@@ -0,0 +1,6 @@
+sudo rm -rf /tmp/oai_test_setup
+mkdir /tmp/oai_test_setup
+cd /tmp/oai_test_setup
+git clone $REPOSITORY_URL oai
+cd oai
+git checkout $COMMIT_ID

cmake_targets/autotests/v2/actions/compilation.bash

@@ -0,0 +1,9 @@
+cd /tmp/oai_test_setup/oai
+source oaienv
+cd cmake_targets
+rm -rf log
+mkdir -p log
+echo $BUILD_ARGUMENTS
+./build_oai $BUILD_ARGUMENTS
+echo $BUILD_OUTPUT
+ls $BUILD_OUTPUT

cmake_targets/autotests/v2/actions/execution.bash

@@ -0,0 +1,4 @@
+cd /tmp/oai_test_setup/oai
+source oaienv
+echo $EXEC $EXEC_ARGS
+$EXEC $EXEC_ARGS

cmake_targets/autotests/v2/actions/execution_compile.bash

@@ -0,0 +1,8 @@
+cd /tmp/oai_test_setup/oai
+source oaienv
+cd cmake_targets
+rm -rf log
+mkdir -p log
+bash -c "$PRE_BUILD"
+$BUILD_PROG $BUILD_ARGUMENTS
+bash -c "$PRE_EXEC"

cmake_targets/autotests/v2/actions/modem.py

@@ -0,0 +1,103 @@
+import sys, os, select, re, time
+
+def quit(r):
+    sys.stdout.flush()
+    os._exit(r)
+
+class ModemResponse:
+    def __init__(self, retcode, retstring):
+        self.ret = retcode
+        self.data = retstring
+
+class Modem:
+    def open(self):
+        self.i = os.open(self.devname, os.O_RDONLY)
+        self.o = os.open(self.devname, os.O_WRONLY)
+        #clear output of modem, if any is pending (not sure of this)
+        while True:
+            (ri, ro, re) = select.select([self.i], [], [self.i], 0)
+            if len(ri) == 0:
+                break
+            l = os.read(self.i, 65536)
+            print "WARNING: modem had unread data: '" + \
+                  l.replace('\r', '\\r') + "'"
+
+    def __init__(self, devname):
+        self.devname = devname
+        self.i = -1
+        self.o = -1
+        self.open()
+
+    def send(self, s):
+        print "DEBUG: SEND TO MODEM: '" + s + "'"
+        os.write(self.o, s+"\r")
+
+    def recv(self):
+        return os.read(self.i, 65536)
+
+    def wait(self):
+        ok         = '\r\nOK\r\n'
+        error      = '\r\nERROR\r\n'
+        cme_error  = '\r\nCME ERROR:[^\r]*\r\n'
+        no_carrier = '\r\nNO CARRIER\r\n'
+        l = ''
+        while True:
+            l = l + self.recv()
+            print "DEBUG: CURRENT MODEM RESPONSE: '" + \
+                  l.replace('\r','\\r').replace('\n','\\n') + "'"
+
+            #AT returned 'things' are "\r\nXXXX\r\n", look for that.
+            #Check if last one matches 'ok', 'error' or 'cme_error'.
+            #(Hopefully this is enough and no other reply is possible.)
+            #This code accepts invalid responses from modem, ie. all
+            #that does not fit in the 'findall' is thrashed away, maybe
+            #we want to do something in this case?
+
+            res = re.findall('\r\n[^\r]*\r\n', l)
+            if len(res) == 0:
+                print "DEBUG: NO MATCH: wait for more input from modem"
+                continue
+            last_res = res[len(res)-1]
+            print "DEBUG: CURRENT LAST LINE: '" + \
+                  last_res.replace('\r','\\r').replace('\n','\\n')+"'"
+            if re.match(ok, last_res) != None:
+                return ModemResponse(True, l)
+            if (   re.match(error,      last_res) != None or
+                   re.match(cme_error,  last_res) != None or
+                   re.match(no_carrier, last_res) != None):
+                return ModemResponse(False, l)
+        #TODO purge?
+        #re.purge()
+
+    def modem_reset_cycle(self):
+        #close all
+        os.close(self.i)
+        os.close(self.o)
+        self.i = -1
+        self.o = -1
+
+        print "DEBUG: RESET CYCLE: wait for modem to go away"
+        #wait for file descriptor to go away
+        while True:
+            try:
+                test = os.open(self.devname, os.O_RDONLY)
+                os.close(test)
+                time.sleep(0.1)
+            except BaseException, e:
+                break
+        print "DEBUG: RESET CYCLE: modem has gone away"
+
+        print "DEBUG: RESET CYCLE: wait for modem to come back"
+        #wait for file descriptor to be back, try to open it over and over
+        #TODO: use inotify here? (it's not in basic python as it seems)
+        while True:
+            try:
+                test = os.open(self.devname, os.O_RDONLY)
+                os.close(test)
+                break
+            except BaseException, e:
+                time.sleep(0.1)
+        print "DEBUG: RESET CYCLE: modem is back"
+
+        #back to business
+        self.open()

cmake_targets/autotests/v2/actions/run_enb.bash

@@ -0,0 +1,10 @@
+#enable control+C reception (to be refined if it does not work)
+stty isig intr ^C
+
+cd /tmp/oai_test_setup/oai
+source oaienv
+cd cmake_targets/lte_build_oai/build
+ulimit -c unlimited
+sudo rm -f core
+#sudo -E ./lte-softmodem -O $OPENAIR_DIR/cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.conf
+sudo -E ./lte-softmodem -O /tmp/enb.conf

cmake_targets/autotests/v2/actions/server_tcp.bash

@@ -0,0 +1,4 @@
+stty isig intr ^C
+
+#timeout -s 9 20s iperf -s -i1
+iperf -s -i1

cmake_targets/autotests/v2/actions/server_udp.bash

@@ -0,0 +1,4 @@
+stty isig intr ^C
+
+#timeout -s 9 20s iperf -s -i1 -u
+iperf -s -i1 -u

cmake_targets/autotests/v2/actions/start_bandrich.bash

@@ -0,0 +1,24 @@
+#enable control+C reception (to be refined if it does not work)
+stty isig intr ^C
+
+#If /dev/bandrich is not present when we start the test, what to do?
+#The following commented lines are an attempt at solving this.
+#This is not satisfying, so we rather do nothing.
+
+##the UE got stuck once, I had to run usb_modeswitch by hand.
+##So at this point, if /dev/bandrich does not exist, maybe the UE is
+##stuck for whatever reason. Let's forcefully run usb_modeswitch.
+#if [ ! -e /dev/bandrich ]; then sudo usb_modeswitch -v 1a8d -p 1000 -I -W -K; true; fi
+#
+##wait for /dev/bandrich (TODO: use inotify?)
+##may fail if the bandrich is in a bad state
+#while [ ! -e /dev/bandrich ]; do sleep 1; done
+
+cd /tmp/oai_test_setup/oai
+source oaienv
+cd cmake_targets/autotests/v2/actions
+python start_bandrich.py
+
+sudo wvdial -C wvdial.bandrich.conf || true
+
+python stop_bandrich.py

cmake_targets/autotests/v2/actions/start_bandrich.py

@@ -0,0 +1,55 @@
+import time
+
+from modem import quit, Modem
+
+try:
+    modem = Modem("/dev/bandrich.control")
+
+    #test that modem is there
+    print "INFO: check modem's presence"
+    modem.send('AT')
+    if modem.wait().ret != True:
+        print "ERROR: no modem?"
+        quit(1)
+
+    #activate the modem, be brutal and reset it too!
+    print "INFO: reset and activate the modem"
+    modem.send('AT+CFUN=1,1')
+    if modem.wait().ret != True:
+        print "ERROR: failed asking modem for activation"
+        quit(1)
+
+    #modem has gone! wait for it to pop up again
+    modem.modem_reset_cycle()
+
+    #wait for modem to be connected
+    #timeout after one minute
+    print "INFO: wait for modem to be connected (timeout: one minute)"
+    start_time = time.time()
+    while True:
+        modem.send('AT+CGATT?')
+        r = modem.wait()
+        if r.ret != True:
+            print "ERROR: failed checking attachment status of modem"
+            quit(1)
+        if "+CGATT: 1" in r.data:
+            break
+        if not "CGATT: 0" in r.data:
+            print "ERROR: bad data when checking attachment status of modem"
+            quit(1)
+        time.sleep(0.1)
+        if time.time() > start_time + 60:
+            print "ERROR: modem not connected after one minute, close modem"
+            modem.send('AT+CFUN=4')
+            r = modem.wait()
+            if r.ret != True:
+                print "ERROR: closing modem failed"
+            quit(1)
+
+    print "INFO: modem is connected"
+
+except BaseException, e:
+    print "ERROR: " + str(e)
+    quit(1)
+
+quit(0)

cmake_targets/autotests/v2/actions/stop_bandrich.py

@@ -0,0 +1,29 @@
+import time
+
+from modem import quit, Modem
+
+try:
+    modem = Modem("/dev/bandrich.control")
+
+    #test that modem is there
+    print "INFO: check modem's presence"
+    modem.send('AT')
+    r = modem.wait()
+    if r.ret != True and "NO CARRIER" not in r.data:
+        print "ERROR: no modem?"
+        quit(1)
+    if "NO CARRIER" in r.data:
+        print "WARNING: 'NO CARRIER' detected, not sure if handled correctly"
+
+    #deactivate the modem
+    print "INFO: deactivate the modem"
+    modem.send('AT+CFUN=4')
+    if modem.wait().ret != True:
+        print "ERROR: failed asking modem for deactivation"
+        quit(1)
+
+except BaseException, e:
+    print "ERROR: " + str(e)
+    quit(1)
+
+quit(0)

cmake_targets/autotests/v2/actions/wvdial.bandrich.conf

@@ -0,0 +1,36 @@
+[Dialer Defaults]
+Modem = /dev/bandrich.data
+ISDN = off
+Modem Type = Analog Modem
+Baud = 9600
+Init = ATZ
+Init2 = AT+CPIN?
+Init3 = AT+CGREG?
+Init4 = AT+COPS?
+Init5 = AT+CSQ
+Init6 =
+Init7 = AT+CGATT=1
+Init8 = 
+Init9 = 
+Phone = *99***1#
+Phone1 = 
+Phone2 = 
+Phone3 = 
+Phone4 = 
+Dial Prefix = 
+Dial Attempts = 1
+Dial Command = ATM1L3DT
+Ask Password = off
+Password = ''
+Username = ImaginLab
+Auto Reconnect = off
+Abort on Busy = off
+Carrier Check = on
+Check Def Route = on
+Abort on No Dialtone = on
+Stupid Mode = on
+Idle Seconds = 0
+Auto DNS = on
+;Minimize = off
+;Dock = off
+;Do NOT edit this file by hand!

cmake_targets/autotests/v2/alu_test.py

@@ -0,0 +1,389 @@
+import threading, os, re
+
+from utils import quickshell, log, TestFailed, do_tests
+from task import Task, WAITLOG_SUCCESS
+
+class alu_test:
+    def __init__(self,
+                 epc, enb, ue,
+                 openair,
+                 user, password,
+                 log_subdir,
+                 env):
+        self.epc_machine  = epc
+        self.enb_machine  = enb
+        self.ue_machine   = ue
+        self.openair_dir  = openair
+        self.oai_user     = user
+        self.oai_password = password
+        self.env          = env
+
+        self.task_hss = None
+        self.task_enb = None
+        self.task_ue  = None
+
+        self.logdir = openair + '/cmake_targets/autotests/log/' + log_subdir
+        quickshell('mkdir -p ' + self.logdir)
+
+        #event object used to wait for several tasks at once
+        self.event = threading.Event()
+
+    ##########################################################################
+    # finish
+    ##########################################################################
+    def finish(self):
+        #brutally kill tasks still running
+        #TODO: call 'wait', some processes may still be there as zombies
+        if self.task_hss != None and self.task_hss.alive():
+            self.task_hss.kill()
+        if self.task_enb != None and self.task_enb.alive():
+            self.task_enb.kill()
+        if self.task_ue != None and self.task_ue.alive():
+            self.task_ue.kill()
+
+    ##########################################################################
+    # start_epc
+    ##########################################################################
+    def start_epc(self):
+        #launch HSS, wait for prompt
+        log("INFO: ALU test: run HSS")
+        self.task_hss = Task("actions/alu_hss.bash",
+                "alu_hss",
+                self.epc_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/alu_hss." + self.epc_machine,
+                event=self.event)
+        self.task_hss.waitlog('S6AS_SIM-> ')
+
+        #then launch EPC, wait for connection on HSS side
+        log("INFO: ALU test: run EPC")
+        task_epc = Task("actions/alu_epc.bash",
+                "ALU EPC",
+                self.epc_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/alu_epc." + self.epc_machine)
+        ret = task_epc.wait()
+        if ret != 0:
+            log("ERROR: EPC start failure");
+            raise TestFailed()
+        self.task_hss.waitlog('Connected\n')
+
+    ##########################################################################
+    # stop_epc
+    ##########################################################################
+    def stop_epc(self):
+        #stop EPC, wait for disconnection on HSS side
+        log("INFO: ALU test: stop EPC")
+        task_epc = Task("actions/alu_epc_stop.bash",
+                "alu_epc_stop",
+                self.epc_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/alu_epc_stop." + self.epc_machine)
+        ret = task_epc.wait()
+        if ret != 0:
+            log("ERROR: ALU test: ALU EPC stop failed")
+            raise TestFailed()
+        self.task_hss.waitlog('Disconnected\n')
+
+        log("INFO: ALU test: stop HSS")
+        self.task_hss.sendnow("exit\n")
+        ret = self.task_hss.wait()
+        if ret != 0:
+            log("ERROR: ALU test: ALU HSS failed")
+            raise TestFailed()
+
+    ##########################################################################
+    # compile_enb
+    ##########################################################################
+    def compile_enb(self, build_arguments):
+        log("INFO: ALU test: compile softmodem")
+        envcomp = list(self.env)
+        envcomp.append('BUILD_ARGUMENTS="' + build_arguments + '"')
+        #we don't care about BUILD_OUTPUT but required (TODO: change that)
+        envcomp.append('BUILD_OUTPUT=/')
+        logdir = self.logdir + "/compile_log"
+        remote_files = "'/tmp/oai_test_setup/oai/cmake_targets/log/*'"
+        post_action = "mkdir -p "+ logdir + \
+                " && sshpass -p " + self.oai_password + \
+                " scp -r " + self.oai_user + \
+                "@" + self.enb_machine + ":" + remote_files + " " + logdir + \
+                " || true"
+        task = Task("actions/compilation.bash",
+                "compile_softmodem",
+                self.enb_machine,
+                self.oai_user,
+                self.oai_password,
+                envcomp,
+                self.logdir + "/compile_softmodem." + self.enb_machine,
+                post_action=post_action)
+        ret = task.wait()
+        if ret != 0:
+            log("ERROR: softmodem compilation failure");
+            raise TestFailed()
+        task.postaction()
+
+    ##########################################################################
+    # start_enb
+    ##########################################################################
+    def start_enb(self, config_file):
+        #copy wanted configuration file
+        quickshell("sshpass -p " + self.oai_password +
+                   " scp config/" + config_file + " " +
+                   self.oai_user + "@" + self.enb_machine + ":/tmp/enb.conf")
+
+        #run softmodem
+        log("INFO: ALU test: run softmodem with configuration file " +
+            config_file)
+        self.task_enb = Task("actions/run_enb.bash",
+                "run_softmodem",
+                self.enb_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/run_softmodem." + self.enb_machine,
+                event=self.event)
+        self.task_enb.waitlog('got sync')
+
+    ##########################################################################
+    # stop_enb
+    ##########################################################################
+    def stop_enb(self):
+        log("INFO: ALU test: stop softmodem")
+        self.task_enb.sendnow("%c" % 3)
+        ret = self.task_enb.wait()
+        if ret != 0:
+            log("ERROR: ALU test: softmodem failed")
+            #not sure if we have to quit here or not
+            #os._exit(1)
+
+    ##########################################################################
+    # start_bandrich_ue
+    ##########################################################################
+    def start_bandrich_ue(self):
+        log("INFO: ALU test: start bandrich UE")
+        self.task_ue = Task("actions/start_bandrich.bash",
+                "start_bandrich",
+                self.ue_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/start_bandrich." + self.ue_machine,
+                event=self.event)
+        self.task_ue.waitlog("local  IP address", event=self.event)
+        self.event.wait()
+
+        #at this point one task has died or we have the line in the log
+        if self.task_ue.waitlog_state != WAITLOG_SUCCESS:
+            log("ERROR: ALU test: bandrich UE did not connect")
+            raise TestFailed()
+
+        self.event.clear()
+
+        if (    not self.task_enb.alive() or
+                not self.task_hss.alive() or
+                not self.task_ue.alive()):
+            log("ERROR: ALU test: eNB, HSS or UE task died")
+            raise TestFailed()
+
+        #get bandrich UE IP
+        l = open(self.task_ue.logfile, "r").read()
+        self.bandrich_ue_ip = re.search("local  IP address (.*)\n", l) \
+                                .groups()[0]
+        log("INFO: ALU test: bandrich UE IP address: " + self.bandrich_ue_ip)
+
+    ##########################################################################
+    # stop_bandrich_ue
+    ##########################################################################
+    def stop_bandrich_ue(self):
+        log("INFO: ALU test: stop bandrich UE")
+        self.task_ue.sendnow("%c" % 3)
+        ret = self.task_ue.wait()
+        if ret != 0:
+            log("ERROR: ALU test: task bandrich UE failed")
+            #not sure if we have to quit here or not
+            #os._exit(1)
+
+    ##########################################################################
+    # _do_traffic (internal function, do not call out of the class)
+    ##########################################################################
+    def _do_traffic(self, name,
+            server_code, server_machine, server_ip,
+            client_code, client_machine,
+            waitlog,
+            server_logfile, client_logfile,
+            udp_bandwidth=None):
+        log("INFO: ALU test: run traffic: " + name)
+
+        log("INFO: ALU test:     launch server")
+        task_traffic_server = Task("actions/" + server_code + ".bash",
+                server_logfile,
+                server_machine,
+                self.oai_user,
+                self.oai_password,
+                self.env,
+                self.logdir + "/" + server_logfile + "." + server_machine,
+                event=self.event)
+        task_traffic_server.waitlog(waitlog)
+
+        env = list(self.env)
+        if udp_bandwidth != None:
+            env.append("UDP_BANDWIDTH=" + udp_bandwidth)
+        env.append("SERVER_IP=" + server_ip)
+
+        log("INFO: ALU test:     launch client")
+        task_traffic_client = Task("actions/" + client_code + ".bash",
+                client_logfile,
+                client_machine,
+                self.oai_user,
+                self.oai_password,
+                env,
+                self.logdir + "/" + client_logfile + "." + client_machine,
+                event=self.event)
+        log("INFO: ALU test:     wait for client to finish (or some error)")
+
+        self.event.wait()
+        log("DEBUG: event.wait() done")
+
+        if (    not self.task_enb.alive() or
+                not self.task_hss.alive() or
+                not self.task_ue.alive()):
+            log("ERROR: unexpected task exited, test failed, kill all")
+            if task_traffic_client.alive():
+                task_traffic_client.kill()
+            if self.task_enb.alive():
+                self.task_enb.kill()
+            if self.task_ue.alive():
+                self.task_ue.kill()
+
+        ret = task_traffic_client.wait()
+        if ret != 0:
+            log("ERROR: ALU test: downlink traffic failed")
+            #not sure if we have to quit here or not
+            #os._exit(1)
+
+        #stop downlink server
+        #log("INFO: ALU test:     stop server (kill ssh connection)")
+        #task_traffic_server.kill()
+        log("INFO: ALU test:     stop server (ctrl+z then kill -9 %1)")
+        task_traffic_server.sendnow("%ckill -9 %%1 || true\n" % 26)
+        log("INFO: ALU test:     wait for server to quit")
+        task_traffic_server.wait()
+
+        self.event.clear()
+
+        if (    not self.task_enb.alive() or
+                not self.task_hss.alive() or
+                not self.task_ue.alive()):
+            log("ERROR: ALU test: eNB, HSS or UE task died")
+            raise TestFailed()
+
+    ##########################################################################
+    # dl_tcp
+    ##########################################################################
+    def dl_tcp(self):
+        self._do_traffic("bandrich downlink TCP",
+                         "server_tcp", self.ue_machine, self.bandrich_ue_ip,
+                         "client_tcp", self.epc_machine,
+                         "Server listening on TCP port 5001",
+                         "bandrich_downlink_tcp_server",
+                         "bandrich_downlink_tcp_client")
+
+    ##########################################################################
+    # ul_tcp
+    ##########################################################################
+    def ul_tcp(self):
+        self._do_traffic("bandrich uplink TCP",
+                         "server_tcp", self.epc_machine, "192.172.0.1",
+                         "client_tcp", self.ue_machine,
+                         "Server listening on TCP port 5001",
+                         "bandrich_uplink_tcp_server",
+                         "bandrich_uplink_tcp_client")
+
+    ##########################################################################
+    # dl_udp
+    ##########################################################################
+    def dl_udp(self, bandwidth):
+        self._do_traffic("bandrich downlink UDP",
+                         "server_udp", self.ue_machine, self.bandrich_ue_ip,
+                         "client_udp", self.epc_machine,
+                         "Server listening on UDP port 5001",
+                         "bandrich_downlink_udp_server",
+                         "bandrich_downlink_udp_client",
+                         udp_bandwidth=bandwidth)
+
+    ##########################################################################
+    # ul_udp
+    ##########################################################################
+    def ul_udp(self, bandwidth):
+        self._do_traffic("bandrich uplink UDP",
+                         "server_udp", self.epc_machine, "192.172.0.1",
+                         "client_udp", self.ue_machine,
+                         "Server listening on UDP port 5001",
+                         "bandrich_uplink_udp_server",
+                         "bandrich_uplink_udp_client",
+                         udp_bandwidth=bandwidth)
+
+##############################################################################
+# run_b210_alu
+##############################################################################
+
+def run_b210_alu(tests, openair_dir, oai_user, oai_password, env):
+    if not do_tests(tests['b210']['alu']):
+        return
+
+    #compile eNB
+
+    alu = alu_test(epc='amerique', enb='hutch', ue='stevens',
+                   openair=openair_dir,
+                   user=oai_user, password=oai_password,
+                   log_subdir='enb_tests/b210_alu/compile_enb',
+                   env=env)
+
+    try:
+        alu.compile_enb("--eNB -w USRP -x -c --disable-cpu-affinity")
+    except BaseException, e:
+        log("ERROR: ALU test failed: eNB compilation failed: " + str(e))
+        return
+
+    #run tests
+
+    udp_dl_bandwidth = { "5"  : "15M",
+                         "10" : "30M",
+                         "20" : "60M" }
+
+    udp_ul_bandwidth = { "5"  : "7M",
+                         "10" : "15M",
+                         "20" : "15M" }
+
+    for bw in ('5', '10', '20'):
+        if do_tests(tests['b210']['alu'][bw]):
+            log("INFO: ALU test: run tests for bandwidth " + bw + " MHz")
+            ctest = tests['b210']['alu'][bw]
+            alu = alu_test(epc='amerique', enb='hutch', ue='stevens',
+                           openair=openair_dir,
+                           user=oai_user, password=oai_password,
+                           log_subdir='enb_tests/b210_alu/' + bw,
+                           env=env)
+            try:
+                alu.start_epc()
+                alu.start_enb("enb.band7.tm1.usrpb210." + bw + "MHz.conf")
+                if do_tests(ctest['bandrich']):
+                    alu.start_bandrich_ue()
+                    if do_tests(ctest['bandrich']['tcp']['dl']): alu.dl_tcp()
+                    if do_tests(ctest['bandrich']['tcp']['ul']): alu.ul_tcp()
+                    if do_tests(ctest['bandrich']['udp']['dl']):
+                        alu.dl_udp(udp_dl_bandwidth[bw])
+                    if do_tests(ctest['bandrich']['udp']['ul']):
+                        alu.ul_udp(udp_ul_bandwidth[bw])
+                    alu.stop_bandrich_ue()
+                alu.stop_enb()
+                alu.stop_epc()
+            except BaseException, e:
+                log("ERROR: ALU test failed: " + str(e))
+                alu.finish()

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.10MHz.conf

@@ -0,0 +1,175 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "92";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "eNodeB_3GPP";
+	node_timing                                           = "synch_to_ext_device";
+	node_synch_ref                                        = 0;
+        frame_type					      = "FDD";
+        tdd_config 					      = 3;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 7;
+        downlink_frequency      			      = 2660000000L;
+        uplink_frequency_offset 			      = -120000000;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 50;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 1;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 32;
+        pdsch_referenceSignalPower 			      = -24;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+        /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -103;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+        */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -104;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.19/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.19/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.20MHz.conf

@@ -0,0 +1,175 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "92";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "eNodeB_3GPP";
+	node_timing                                           = "synch_to_ext_device";
+	node_synch_ref                                        = 0;
+        frame_type					      = "FDD";
+        tdd_config 					      = 3;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 7;
+        downlink_frequency      			      = 2660000000L;
+        uplink_frequency_offset 			      = -120000000;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 100;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 1;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 32;
+        pdsch_referenceSignalPower 			      = -24;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+        /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -103;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+        */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -104;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.19/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.19/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);

cmake_targets/autotests/v2/config/enb.band7.tm1.usrpb210.5MHz.conf

@@ -0,0 +1,175 @@
+Active_eNBs = ( "eNB_Eurecom_LTEBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+eNBs =
+(
+ {
+    ////////// Identification parameters:
+    eNB_ID    =  0xe00;
+
+    cell_type =  "CELL_MACRO_ENB";
+
+    eNB_name  =  "eNB_Eurecom_LTEBox";
+
+    // Tracking area code, 0x0000 and 0xfffe are reserved values
+    tracking_area_code  =  "1";
+
+    mobile_country_code =  "208";
+
+    mobile_network_code =  "92";
+
+       ////////// Physical parameters:
+
+    component_carriers = (
+      {
+        node_function                                         = "eNodeB_3GPP";
+	node_timing                                           = "synch_to_ext_device";
+	node_synch_ref                                        = 0;
+        frame_type					      = "FDD";
+        tdd_config 					      = 3;
+        tdd_config_s            			      = 0;
+        prefix_type             			      = "NORMAL";
+        eutra_band              			      = 7;
+        downlink_frequency      			      = 2660000000L;
+        uplink_frequency_offset 			      = -120000000;
+        Nid_cell					      = 0;
+        N_RB_DL                 			      = 25;
+        Nid_cell_mbsfn          			      = 0;
+        nb_antenna_ports          			      = 1;
+        nb_antennas_tx          			      = 1;
+        nb_antennas_rx          			      = 1;
+        tx_gain                                            = 90;
+        rx_gain                                            = 125;
+        prach_root              			      = 0;
+        prach_config_index      			      = 0;
+        prach_high_speed        			      = "DISABLE";
+        prach_zero_correlation  			      = 1;
+        prach_freq_offset       			      = 2;
+        pucch_delta_shift       			      = 1;
+        pucch_nRB_CQI           			      = 1;
+        pucch_nCS_AN            			      = 0;
+        pucch_n1_AN             			      = 32;
+        pdsch_referenceSignalPower 			      = -24;
+        pdsch_p_b                  			      = 0;
+        pusch_n_SB                 			      = 1;
+        pusch_enable64QAM          			      = "DISABLE";
+        pusch_hoppingMode                                  = "interSubFrame";
+        pusch_hoppingOffset                                = 0;
+        pusch_groupHoppingEnabled  			      = "ENABLE";
+        pusch_groupAssignment      			      = 0;
+        pusch_sequenceHoppingEnabled		   	      = "DISABLE";
+        pusch_nDMRS1                                       = 1;
+        phich_duration                                     = "NORMAL";
+        phich_resource                                     = "ONESIXTH";
+        srs_enable                                         = "DISABLE";
+        /*  srs_BandwidthConfig                                =;
+        srs_SubframeConfig                                 =;
+        srs_ackNackST                                      =;
+        srs_MaxUpPts                                       =;*/
+
+        pusch_p0_Nominal                                   = -96;
+        pusch_alpha                                        = "AL1";
+        pucch_p0_Nominal                                   = -103;
+        msg3_delta_Preamble                                = 6;
+        pucch_deltaF_Format1                               = "deltaF2";
+        pucch_deltaF_Format1b                              = "deltaF3";
+        pucch_deltaF_Format2                               = "deltaF0";
+        pucch_deltaF_Format2a                              = "deltaF0";
+        pucch_deltaF_Format2b		    	      = "deltaF0";
+
+        rach_numberOfRA_Preambles                          = 64;
+        rach_preamblesGroupAConfig                         = "DISABLE";
+        /*
+        rach_sizeOfRA_PreamblesGroupA                      = ;
+        rach_messageSizeGroupA                             = ;
+        rach_messagePowerOffsetGroupB                      = ;
+        */
+        rach_powerRampingStep                              = 4;
+        rach_preambleInitialReceivedTargetPower            = -104;
+        rach_preambleTransMax                              = 10;
+        rach_raResponseWindowSize                          = 10;
+        rach_macContentionResolutionTimer                  = 48;
+        rach_maxHARQ_Msg3Tx                                = 4;
+
+        pcch_default_PagingCycle                           = 128;
+        pcch_nB                                            = "oneT";
+        bcch_modificationPeriodCoeff			      = 2;
+        ue_TimersAndConstants_t300			      = 1000;
+        ue_TimersAndConstants_t301			      = 1000;
+        ue_TimersAndConstants_t310			      = 1000;
+        ue_TimersAndConstants_t311			      = 10000;
+        ue_TimersAndConstants_n310			      = 20;
+        ue_TimersAndConstants_n311			      = 1;
+
+	ue_TransmissionMode				      = 1;
+      }
+    );
+
+    srb1_parameters :
+    {
+        # timer_poll_retransmit = (ms) [5, 10, 15, 20,... 250, 300, 350, ... 500]
+        timer_poll_retransmit    = 80;
+
+        # timer_reordering = (ms) [0,5, ... 100, 110, 120, ... ,200]
+        timer_reordering         = 35;
+
+        # timer_reordering = (ms) [0,5, ... 250, 300, 350, ... ,500]
+        timer_status_prohibit    = 0;
+
+        # poll_pdu = [4, 8, 16, 32 , 64, 128, 256, infinity(>10000)]
+        poll_pdu                 =  4;
+
+        # poll_byte = (kB) [25,50,75,100,125,250,375,500,750,1000,1250,1500,2000,3000,infinity(>10000)]
+        poll_byte                =  99999;
+
+        # max_retx_threshold = [1, 2, 3, 4 , 6, 8, 16, 32]
+        max_retx_threshold       =  4;
+    }
+
+    # ------- SCTP definitions
+    SCTP :
+    {
+        # Number of streams to use in input/output
+        SCTP_INSTREAMS  = 2;
+        SCTP_OUTSTREAMS = 2;
+    };
+
+    ////////// MME parameters:
+
+    mme_ip_address      = ( { ipv4       = "192.168.12.26";
+                              ipv6       = "192:168:30::17";
+                              active     = "yes";
+                              preference = "ipv4";
+                            }
+                          );
+
+    NETWORK_INTERFACES :
+    {
+
+        ENB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1_MME              = "192.168.12.19/24";
+        ENB_INTERFACE_NAME_FOR_S1U               = "eth0";
+        ENB_IPV4_ADDRESS_FOR_S1U                 = "192.168.12.19/24";
+        ENB_PORT_FOR_S1U                         = 2152; # Spec 2152
+    };
+
+    log_config :
+    {
+      global_log_level                      ="info";
+      global_log_verbosity                  ="medium";
+      hw_log_level                          ="info";
+      hw_log_verbosity                      ="medium";
+      phy_log_level                         ="info";
+      phy_log_verbosity                     ="medium";
+      mac_log_level                         ="info";
+      mac_log_verbosity                     ="high";
+      rlc_log_level                         ="info";
+      rlc_log_verbosity                     ="medium";
+      pdcp_log_level                        ="info";
+      pdcp_log_verbosity                    ="medium";
+      rrc_log_level                         ="info";
+      rrc_log_verbosity                     ="medium";
+   };
+  }
+);

cmake_targets/autotests/v2/connection.py

@@ -0,0 +1,104 @@
+import os, subprocess, time, fcntl, termios, tty, signal, thread
+
+from utils import log
+
+class connection:
+    def __init__(self, description, host, user, password):
+        self.description = description
+        self.host = host
+        self.user = user
+        self.password = password
+        self.sendlock = thread.allocate_lock()
+
+        try:
+            (pid, fd) = os.forkpty()
+        except BaseException, e:
+            log("ERROR: forkpty for '" + description + "': " + e)
+            (pid, fd) = (-1, -1)
+
+        if pid == -1:
+            log("ERROR: creating connection for '" + description + "'")
+            os._exit(1)
+
+        # child process, run ssh
+        if pid == 0:
+            try:
+                os.execvp('sshpass', ['sshpass', '-p', password,
+                          'ssh', user + '@' + host])
+            except BaseException, e:
+                log("ERROR: execvp for '" + description + "': " + e)
+            log("ERROR: execvp failed for '" + description + "'")
+            os._exit(1)
+
+        # parent process
+        # make the TTY raw to avoid getting input printed and no ^M
+        try:
+            tty.setraw(fd, termios.TCSANOW)
+        except BaseException, e:
+            log("ERROR: failed configuring TTY: " + str(e))
+            os._exit(1)
+
+#        try:
+#            fcntl.fcntl(fd, fcntl.F_SETFL,
+#                        fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)
+#        except:
+#            log("ERROR: fcntl failed for '" + description + "'")
+#            os._exit(1)
+
+        self.pid = pid
+        self.fd = fd
+        self.active = True
+        self.retcode = -1
+
+    def send(self, string):
+        if self.active == False:
+            log("ERROR: send: child is dead for '" + self.description + "'")
+            return -1
+
+        try:
+            (pid, out) = os.waitpid(self.pid, os.WNOHANG)
+        except BaseException, e:
+            log("ERROR: send: waitpid failed for '" + self.description +
+                "': " + str(e))
+            (pid, out) = (self.pid, 1)
+        if pid != 0:
+            log("ERROR: send: child process dead for '" +
+                self.description + "'")
+            try:
+                os.close(self.fd)
+            except BaseException, e:
+                #we don't care about errors at this point
+                pass
+            self.active = False
+            self.retcode = out
+            return -1
+
+        self.sendlock.acquire()
+
+        length = len(string)
+        while length != 0:
+            try:
+                ret = os.write(self.fd, string)
+            except BaseException, e:
+                log("ERROR: send fails for '" + self.description + "': " +
+                    str(e))
+                os._exit(1)
+
+            if ret == 0:
+                log("ERROR: send: write returns 0 for '" +
+                    self.description + "'")
+                os._exit(1)
+
+            length = length - ret
+            string = string[ret:]
+
+        self.sendlock.release()
+
+        return 0
+
+    def kill(self, signal=signal.SIGTERM):
+        log("INFO: kill connection '" + self.description + "'")
+        try:
+            os.kill(self.pid, signal)
+        except BaseException, e:
+            log("ERROR: connection.kill: " + str(e))

cmake_targets/autotests/v2/machine_list.py

@@ -0,0 +1,79 @@
+import threading, os
+
+from utils import log
+
+class MachineWaiterThread(threading.Thread):
+    def __init__(self, machine, tasks):
+        threading.Thread.__init__(self)
+        self.machine = machine
+        self.tasks = tasks
+
+    def run(self):
+        try:
+            for task in self.tasks:
+                ret = task.wait()
+                if ret != 0:
+                    log("ERROR: task '" + task.description + "' failed " +
+                        "on machine " + self.machine.name)
+                task.postaction()
+            self.machine.unbusy()
+        except BaseException, e:
+            log("ERROR: MachineWaiterThread: " + str(e))
+            os._exit(1)
+
+class Machine():
+    def __init__(self, machine, cond):
+        self.name = machine
+        self.free = True
+        self.cond = cond
+    def busy(self, tasks):
+        waiter = MachineWaiterThread(self, tasks)
+        waiter.start()
+    def unbusy(self):
+        self.cond.acquire()
+        self.free = True
+        self.cond.notify()
+        self.cond.release()
+
+class MachineList():
+    def __init__(self, list):
+        self.list = []
+        self.cond = threading.Condition()
+        for m in list:
+            self.list.append(Machine(m, self.cond))
+
+    def get_free_machine(self):
+        try:
+            self.cond.acquire()
+            while True:
+                free_machine = None
+                for m in self.list:
+                    if m.free == True:
+                        free_machine = m
+                        break
+                if free_machine != None:
+                    break
+                self.cond.wait()
+            free_machine.free = False
+            self.cond.release()
+        except BaseException, e:
+            log("ERROR: machine_list: " + str(e))
+            os._exit(1)
+        return free_machine
+
+    def wait_all_free(self):
+        try:
+            self.cond.acquire()
+            while True:
+                all_free = True
+                for m in self.list:
+                    if m.free == False:
+                        all_free = False
+                        break
+                if all_free == True:
+                    break
+                self.cond.wait()
+            self.cond.release()
+        except BaseException, e:
+            log("ERROR: machine_list: " + str(e))
+            os._exit(1)

cmake_targets/autotests/v2/main.py

@@ -0,0 +1,687 @@
+#!/usr/bin/python
+
+import os, re, sys, time, threading, thread
+import xml.etree.ElementTree as ET
+
+from utils import test_in_list, quickshell, log
+from task import Task, WAITLOG_SUCCESS, WAITLOG_FAILURE
+from machine_list import MachineList
+
+oai_user         = os.environ.get('OAI_USER')
+oai_password     = os.environ.get('OAI_PASS')
+requested_tests  = os.environ.get('OAI_TEST_CASE_GROUP')
+machines         = os.environ.get('MACHINELIST')
+generic_machines = os.environ.get('MACHINELISTGENERIC')
+result_dir       = os.environ.get('RESULT_DIR')
+nruns_softmodem  = os.environ.get('NRUNS_LTE_SOFTMODEM')
+openair_dir      = os.environ.get('OPENAIR_DIR')
+
+some_undef = False
+if (oai_user         == None) :
+        log("variable OAI_USER is not defined")
+        some_undef = True
+if (oai_password     == None) :
+        log("variable OAI_PASS is not defined")
+        some_undef = True
+if (requested_tests  == None) :
+        log("variable OAI_TEST_CASE_GROUP is not defined")
+        some_undef = True
+if (machines         == None) :
+        log("variable MACHINELIST is not defined")
+        some_undef = True
+if (generic_machines == None) :
+        log("variable MACHINELISTGENERIC is not defined")
+        some_undef = True
+if (result_dir       == None) :
+        log("variable RESULT_DIR is not defined")
+        some_undef = True
+if (nruns_softmodem  == None) :
+        log("variable NRUNS_LTE_SOFTMODEM is not defined")
+        some_undef = True
+if (openair_dir      == None) :
+        log("variable OPENAIR_DIR is not defined")
+        some_undef = True
+if (some_undef == True):
+    os._exit(1)
+
+requested_tests  = requested_tests  .replace('"','')
+machines         = machines         .replace('"','')
+generic_machines = generic_machines .replace('"','')
+
+xml_test_file = os.environ.get('OPENAIR_DIR') + \
+                "/cmake_targets/autotests/test_case_list.xml"
+
+xmlTree = ET.parse(xml_test_file)
+xmlRoot = xmlTree.getroot()
+
+exclusion_tests=xmlRoot.findtext('TestCaseExclusionList',default='')
+all_tests=xmlRoot.findall('testCase')
+
+exclusion_tests=exclusion_tests.split()
+requested_tests=requested_tests.split()
+
+#check that exclusion tests are well formatted
+#(6 digits or less than 6 digits followed by +)
+for test in exclusion_tests:
+    if     (not re.match('^[0-9]{6}$', test) and
+            not re.match('^[0-9]{1,5}\+$', test)):
+        log("ERROR: exclusion test is invalidly formatted: " + test)
+        os._exit(1)
+
+#check that requested tests are well formatted
+#(6 digits or less than 6 digits followed by +)
+#be verbose
+for test in requested_tests:
+    if     (re.match('^[0-9]{6}$', test) or
+            re.match('^[0-9]{1,5}\+$', test)):
+        log("INFO: test group/case requested: " + test)
+    else:
+        log("ERROR: requested test is invalidly formatted: " + test)
+        os._exit(1)
+
+#get the list of tests to be done
+todo_tests=[]
+for test in all_tests:
+    if     (test_in_list(test.get('id'), requested_tests) and
+            not test_in_list(test.get('id'), exclusion_tests)):
+        log("INFO: test will be run: " + test.get('id'))
+        todo_tests.append(test)
+    else:
+        log("INFO: test will be skipped: " + test.get('id'))
+
+#get commit ID to use
+commit_id = quickshell("git rev-parse --verify HEAD").replace('\n','')
+if (len(commit_id) != 20*2):
+    log("ERROR: bad commit '" + commit_id + "'")
+log("INFO: test for commit " + commit_id)
+
+#get repository URL
+repository_url = quickshell("git config remote.origin.url").replace('\n','')
+log("INFO: repository URL: " + repository_url)
+
+#prepare environment for tasks
+env = []
+env.append("REPOSITORY_URL=" + repository_url)
+env.append("COMMIT_ID="      + commit_id)
+
+#clone repository on all machines in the test setup
+tasks=[]
+for machine in machines.split():
+    tasks.append(Task("actions/clone_repository.bash",
+                      "clone repository on " + machine,
+                      machine,
+                      oai_user,
+                      oai_password,
+                      env,
+                      openair_dir + "/cmake_targets/autotests/log/clone." \
+                         + machine))
+for task in tasks:
+    log("INFO: wait for task: " + task.description)
+    ret = task.wait()
+    if ret != 0 or not "TEST_SETUP_SUCCESS" in open(task.logfile).read():
+        log("ERROR: task failed: " + task.description)
+        os._exit(1)
+
+##############################################################################
+# run compilation tests                                                      #
+##############################################################################
+
+machine_list = MachineList(generic_machines.split())
+
+for test in todo_tests:
+    action = test.findtext('class')
+    if action != 'compilation':
+        continue
+    id = test.get('id')
+    machine = machine_list.get_free_machine()
+    log("INFO: start " + action + " test " + id + " on machine " +
+        machine.name)
+    tasks = []
+    runenv = list(env)
+    runenv.append('OPENAIR_DIR=/tmp/oai_test_setup/oai')
+    runenv.append('BUILD_ARGUMENTS="'
+                    + test.findtext('compile_prog_args')
+                    + '"')
+    runenv.append('BUILD_OUTPUT="'
+                    + test.findtext('compile_prog_out')
+                          .replace('\n','')
+                    + '"')
+    logdir = openair_dir +"/cmake_targets/autotests/log/"+ id +"/compile_log"
+    remote_files = "'/tmp/oai_test_setup/oai/cmake_targets/log/*'"
+    post_action = "mkdir -p "+ logdir + \
+                  " && sshpass -p " + oai_password + " scp -r " + oai_user + \
+                  "@" + machine.name + ":" + remote_files + " " + logdir + \
+                  " || true"
+    tasks.append(Task("actions/" + action + ".bash",
+                      action + " of test " + id + " on " + machine.name,
+                      machine.name,
+                      oai_user,
+                      oai_password,
+                      runenv,
+                      openair_dir + "/cmake_targets/autotests/log/"
+                         + id + "."
+                         + machine.name,
+                      post_action=post_action))
+    machine.busy(tasks)
+
+##############################################################################
+# run execution tests                                                        #
+##############################################################################
+
+class ExecutionThread(threading.Thread):
+    def __init__(self, id, machine, test):
+        threading.Thread.__init__(self)
+        self.machine = machine
+        self.id = id
+        self.test = test
+
+    def run(self):
+        id = self.id
+        machine = self.machine
+        test = self.test
+
+        # step 1: compile
+
+        log("INFO: start compilation of test " + id + " on machine " +
+            machine.name)
+        tasks = []
+        runenv = list(env)
+        runenv.append('OPENAIR_DIR=/tmp/oai_test_setup/oai')
+        runenv.append('PRE_BUILD="'
+                        + test.findtext('pre_compile_prog')
+                        + '"')
+        runenv.append('BUILD_PROG="'
+                        + test.findtext('compile_prog')
+                        + '"')
+        runenv.append('BUILD_ARGUMENTS="'
+                        + test.findtext('compile_prog_args')
+                        + '"')
+        runenv.append('PRE_EXEC="'
+                        + test.findtext('pre_exec') + " "
+                        + test.findtext('pre_exec_args')
+                        + '"')
+        logdir = openair_dir +"/cmake_targets/autotests/log/"+ id + \
+                 "/compile_log"
+        remote_files = "'/tmp/oai_test_setup/oai/cmake_targets/log/*'"
+        post_action = "mkdir -p "+ logdir + \
+                      " && sshpass -p " + oai_password + \
+                      " scp -r " + oai_user + "@" + machine.name + ":" + \
+                                   remote_files + " " + logdir + \
+                      " || true"
+        task = Task("actions/execution_compile.bash",
+                    "compilation of test " + id + " on " + machine.name,
+                    machine.name,
+                    oai_user,
+                    oai_password,
+                    runenv,
+                    openair_dir + "/cmake_targets/autotests/log/"
+                       + id + "_compile."
+                       + machine.name,
+                    post_action=post_action)
+        ret = task.wait()
+        task.postaction()
+        if ret != 0:
+            log("ERROR: compilation of test " + id + " failed: " + str(ret))
+            machine.unbusy()
+            return
+
+        #step 2: run all tests
+
+        nruns = test.findtext('nruns')
+        args = test.findtext('main_exec_args')
+        i = 0
+        for arg in args.splitlines():
+            i = i+1
+            runenv2 = list(runenv)
+            runenv2.append('OPENAIR_TARGETS=/tmp/oai_test_setup/oai/targets')
+            runenv2.append('EXEC="'
+                             + test.findtext('main_exec')
+                             + '"')
+            runenv2.append('EXEC_ARGS="' + arg + '"')
+            for run in range(int(nruns)):
+                log("INFO: start execution of test " + id + " case " +
+                    str(i) + " run " + str(run) + " on machine " +
+                    machine.name)
+                task =Task("actions/execution.bash",
+                           "execution of test " + id + " on " + machine.name,
+                           machine.name,
+                           oai_user,
+                           oai_password,
+                           runenv2,
+                           openair_dir + "/cmake_targets/autotests/log/"
+                              + id + "_case_" + str(i) + "_run_" + str(run)
+                              + "." + machine.name)
+                ret = task.wait()
+                if ret != 0:
+                    log("ERROR: execution of test " +id+ " failed: " +
+                        str(ret))
+
+        machine.unbusy()
+
+for test in todo_tests:
+    action = test.findtext('class')
+    if action != 'execution':
+        continue
+    id = test.get('id')
+    machine = machine_list.get_free_machine()
+    ExecutionThread(id, machine, test).start()
+
+#wait for compilation/execution tests to be finished
+#log only if some compilation/execution tests are actually done
+for test in todo_tests:
+    action = test.findtext('class')
+    if action == 'execution' or action == 'compilation':
+        log("INFO: requested compilation/execution tests " +
+            "have been launched, waiting for completion")
+        break
+machine_list.wait_all_free()
+
+##############################################################################
+# run eNB softmodem tests                                                    #
+##############################################################################
+
+tests = {
+  'b210' : {
+    'alu' : {
+      '5' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}},
+      '10' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}},
+      '20' : {
+        'bandrich' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }},
+        'sony' : {
+          'tcp' : { 'ul': False, 'dl' : False },
+          'udp' : { 'ul': False, 'dl' : False }}}},
+    'openair-cn' : {}
+  },
+  'x310' : {
+    'alu' : {},
+    'openair-cn' : {}
+  },
+  'exmimo2' : {
+    'alu' : {},
+    'openair-cn' : {}
+  }
+}
+
+todo_tests_ids = []
+for test in todo_tests:
+    todo_tests_ids.append(test.get('id'))
+
+for test in todo_tests_ids:
+  if test=='015500':tests['b210']['alu'][ '5']['bandrich']['udp']['ul']=True
+  if test=='015501':tests['b210']['alu']['10']['bandrich']['udp']['ul']=True
+  if test=='015502':tests['b210']['alu']['20']['bandrich']['udp']['ul']=True
+  if test=='015503':tests['b210']['alu'][ '5']['bandrich']['udp']['dl']=True
+  if test=='015504':tests['b210']['alu']['10']['bandrich']['udp']['dl']=True
+  if test=='015505':tests['b210']['alu']['20']['bandrich']['udp']['dl']=True
+  if test=='015506':log('WARNING: skip test ' + test) #TODO
+  if test=='015507':log('WARNING: skip test ' + test) #TODO
+  if test=='015508':log('WARNING: skip test ' + test) #TODO
+  if test=='015509':log('WARNING: skip test ' + test) #TODO
+  if test=='015510':log('WARNING: skip test ' + test) #TODO
+  if test=='015511':log('WARNING: skip test ' + test) #TODO
+  if test=='015512':tests['b210']['alu'][ '5']['bandrich']['tcp']['ul']=True
+  if test=='015513':tests['b210']['alu']['10']['bandrich']['tcp']['ul']=True
+  if test=='015514':tests['b210']['alu']['20']['bandrich']['tcp']['ul']=True
+  if test=='015515':tests['b210']['alu'][ '5']['bandrich']['tcp']['dl']=True
+  if test=='015516':tests['b210']['alu']['10']['bandrich']['tcp']['dl']=True
+  if test=='015517':tests['b210']['alu']['20']['bandrich']['tcp']['dl']=True
+  if test=='015518':log('WARNING: skip test ' + test) #TODO
+  if test=='015519':log('WARNING: skip test ' + test) #TODO
+  if test=='015520':log('WARNING: skip test ' + test) #TODO
+  if test=='015521':log('WARNING: skip test ' + test) #TODO
+  if test=='015522':log('WARNING: skip test ' + test) #TODO
+  if test=='015523':log('WARNING: skip test ' + test) #TODO
+
+  if test=='015600':log('WARNING: skip test ' + test) #TODO
+  if test=='015601':log('WARNING: skip test ' + test) #TODO
+  if test=='015602':log('WARNING: skip test ' + test) #TODO
+  if test=='015603':log('WARNING: skip test ' + test) #TODO
+  if test=='015604':log('WARNING: skip test ' + test) #TODO
+  if test=='015605':log('WARNING: skip test ' + test) #TODO
+
+  if test=='015700':log('WARNING: skip test ' + test) #TODO
+  if test=='015701':log('WARNING: skip test ' + test) #TODO
+  if test=='015702':log('WARNING: skip test ' + test) #TODO
+  if test=='015703':log('WARNING: skip test ' + test) #TODO
+  if test=='015704':log('WARNING: skip test ' + test) #TODO
+  if test=='015705':log('WARNING: skip test ' + test) #TODO
+
+  if test=='015800':log('WARNING: skip test ' + test) #TODO
+  if test=='015801':log('WARNING: skip test ' + test) #TODO
+  if test=='015802':log('WARNING: skip test ' + test) #TODO
+  if test=='015803':log('WARNING: skip test ' + test) #TODO
+  if test=='015804':log('WARNING: skip test ' + test) #TODO
+  if test=='015805':log('WARNING: skip test ' + test) #TODO
+  if test=='015806':log('WARNING: skip test ' + test) #TODO
+  if test=='015807':log('WARNING: skip test ' + test) #TODO
+  if test=='015808':log('WARNING: skip test ' + test) #TODO
+  if test=='015809':log('WARNING: skip test ' + test) #TODO
+  if test=='015810':log('WARNING: skip test ' + test) #TODO
+  if test=='015811':log('WARNING: skip test ' + test) #TODO
+  if test=='015812':log('WARNING: skip test ' + test) #TODO
+  if test=='015813':log('WARNING: skip test ' + test) #TODO
+  if test=='015814':log('WARNING: skip test ' + test) #TODO
+  if test=='015815':log('WARNING: skip test ' + test) #TODO
+  if test=='015816':log('WARNING: skip test ' + test) #TODO
+  if test=='015817':log('WARNING: skip test ' + test) #TODO
+  if test=='015818':log('WARNING: skip test ' + test) #TODO
+  if test=='015819':log('WARNING: skip test ' + test) #TODO
+  if test=='015820':log('WARNING: skip test ' + test) #TODO
+  if test=='015821':log('WARNING: skip test ' + test) #TODO
+  if test=='015822':log('WARNING: skip test ' + test) #TODO
+  if test=='015823':log('WARNING: skip test ' + test) #TODO
+
+  if test=='016000':log('WARNING: skip test ' + test) #TODO
+  if test=='016001':log('WARNING: skip test ' + test) #TODO
+  if test=='016002':log('WARNING: skip test ' + test) #TODO
+  if test=='016003':log('WARNING: skip test ' + test) #TODO
+  if test=='016004':log('WARNING: skip test ' + test) #TODO
+  if test=='016005':log('WARNING: skip test ' + test) #TODO
+
+  if test=='016100':log('WARNING: skip test ' + test) #TODO
+  if test=='016101':log('WARNING: skip test ' + test) #TODO
+  if test=='016102':log('WARNING: skip test ' + test) #TODO
+  if test=='016103':log('WARNING: skip test ' + test) #TODO
+  if test=='016104':log('WARNING: skip test ' + test) #TODO
+  if test=='016105':log('WARNING: skip test ' + test) #TODO
+
+  if test=='016300':log('WARNING: skip test ' + test) #TODO
+  if test=='016301':log('WARNING: skip test ' + test) #TODO
+  if test=='016302':log('WARNING: skip test ' + test) #TODO
+  if test=='016303':log('WARNING: skip test ' + test) #TODO
+  if test=='016304':log('WARNING: skip test ' + test) #TODO
+  if test=='016305':log('WARNING: skip test ' + test) #TODO
+
+  if test=='016500':log('WARNING: skip test ' + test) #TODO
+  if test=='016501':log('WARNING: skip test ' + test) #TODO
+  if test=='016502':log('WARNING: skip test ' + test) #TODO
+  if test=='016503':log('WARNING: skip test ' + test) #TODO
+  if test=='016504':log('WARNING: skip test ' + test) #TODO
+  if test=='016505':log('WARNING: skip test ' + test) #TODO
+
+  if test=='017000':log('WARNING: skip test ' + test) #TODO
+  if test=='017001':log('WARNING: skip test ' + test) #TODO
+  if test=='017002':log('WARNING: skip test ' + test) #TODO
+  if test=='017003':log('WARNING: skip test ' + test) #TODO
+  if test=='017004':log('WARNING: skip test ' + test) #TODO
+  if test=='017005':log('WARNING: skip test ' + test) #TODO
+
+  if test=='017500':log('WARNING: skip test ' + test) #TODO
+  if test=='017501':log('WARNING: skip test ' + test) #TODO
+  if test=='017502':log('WARNING: skip test ' + test) #TODO
+  if test=='017503':log('WARNING: skip test ' + test) #TODO
+  if test=='017504':log('WARNING: skip test ' + test) #TODO
+  if test=='017505':log('WARNING: skip test ' + test) #TODO
+
+  if test=='018000':log('WARNING: skip test ' + test) #TODO
+  if test=='018001':log('WARNING: skip test ' + test) #TODO
+  if test=='018002':log('WARNING: skip test ' + test) #TODO
+  if test=='018003':log('WARNING: skip test ' + test) #TODO
+  if test=='018004':log('WARNING: skip test ' + test) #TODO
+  if test=='018005':log('WARNING: skip test ' + test) #TODO
+
+  if test=='018500':log('WARNING: skip test ' + test) #TODO
+  if test=='018501':log('WARNING: skip test ' + test) #TODO
+  if test=='018502':log('WARNING: skip test ' + test) #TODO
+  if test=='018503':log('WARNING: skip test ' + test) #TODO
+  if test=='018504':log('WARNING: skip test ' + test) #TODO
+  if test=='018505':log('WARNING: skip test ' + test) #TODO
+
+  if test=='025500':log('WARNING: skip test ' + test) #TODO
+  if test=='025501':log('WARNING: skip test ' + test) #TODO
+  if test=='025502':log('WARNING: skip test ' + test) #TODO
+  if test=='025503':log('WARNING: skip test ' + test) #TODO
+  if test=='025504':log('WARNING: skip test ' + test) #TODO
+  if test=='025505':log('WARNING: skip test ' + test) #TODO
+  if test=='025506':log('WARNING: skip test ' + test) #TODO
+  if test=='025507':log('WARNING: skip test ' + test) #TODO
+  if test=='025508':log('WARNING: skip test ' + test) #TODO
+  if test=='025509':log('WARNING: skip test ' + test) #TODO
+  if test=='025510':log('WARNING: skip test ' + test) #TODO
+  if test=='025511':log('WARNING: skip test ' + test) #TODO
+  if test=='025512':log('WARNING: skip test ' + test) #TODO
+  if test=='025513':log('WARNING: skip test ' + test) #TODO
+  if test=='025514':log('WARNING: skip test ' + test) #TODO
+  if test=='025515':log('WARNING: skip test ' + test) #TODO
+  if test=='025516':log('WARNING: skip test ' + test) #TODO
+  if test=='025517':log('WARNING: skip test ' + test) #TODO
+  if test=='025518':log('WARNING: skip test ' + test) #TODO
+  if test=='025519':log('WARNING: skip test ' + test) #TODO
+  if test=='025520':log('WARNING: skip test ' + test) #TODO
+  if test=='025521':log('WARNING: skip test ' + test) #TODO
+  if test=='025522':log('WARNING: skip test ' + test) #TODO
+  if test=='025523':log('WARNING: skip test ' + test) #TODO
+
+  if test=='025700':log('WARNING: skip test ' + test) #TODO
+  if test=='025701':log('WARNING: skip test ' + test) #TODO
+  if test=='025702':log('WARNING: skip test ' + test) #TODO
+  if test=='025703':log('WARNING: skip test ' + test) #TODO
+  if test=='025704':log('WARNING: skip test ' + test) #TODO
+  if test=='025705':log('WARNING: skip test ' + test) #TODO
+
+from alu_test import run_b210_alu
+
+#B210 ALU tests
+
+run_b210_alu(tests, openair_dir, oai_user, oai_password, env)
+
+#for test in todo_tests:
+#    action = test.findtext('class')
+#    if action != 'lte-softmodem':
+#        continue
+#    if not "start_ltebox" in test.findtext('EPC_main_exec'):
+#        continue
+#    id = test.get('id')
+#    log("INFO: Running ALU test " + id)
+#    logdir = openair_dir + "/cmake_targets/autotests/log/" + id
+#    quickshell("mkdir -p " + logdir)
+#    epc_machine = test.findtext('EPC')
+#    enb_machine = test.findtext('eNB')
+#    ue_machine = test.findtext('UE')
+#
+#    #event object used to wait for several tasks at once
+#    event = threading.Event()
+#
+#    #launch HSS, wait for prompt
+#    log("INFO: " + id + ": run HSS")
+#    task_hss = Task("actions/alu_hss.bash",
+#                    "ALU HSS",
+#                    epc_machine,
+#                    oai_user,
+#                    oai_password,
+#                    env,
+#                    logdir + "/alu_hss." + epc_machine, event=event)
+#    task_hss.waitlog('S6AS_SIM-> ')
+#
+#    #then launch EPC, wait for connection on HSS side
+#    log("INFO: " + id + ": run EPC")
+#    task = Task("actions/alu_epc.bash",
+#                "ALU EPC",
+#                epc_machine,
+#                oai_user,
+#                oai_password,
+#                env,
+#                logdir + "/alu_epc." + epc_machine)
+#    ret = task.wait()
+#    if ret != 0:
+#        log("ERROR: EPC start failure");
+#        os._exit(1)
+#    task_hss.waitlog('Connected\n')
+#
+#    #compile softmodem
+#    log("INFO: " + id + ": compile softmodem")
+#    envcomp = list(env)
+#    envcomp.append('BUILD_ARGUMENTS="' +
+#                   test.findtext('eNB_compile_prog_args') + '"')
+#    #we don't care about BUILD_OUTPUT but it's required (TODO: change that)
+#    envcomp.append('BUILD_OUTPUT=/')
+#    task = Task("actions/compilation.bash",
+#                "compile softmodem",
+#                enb_machine,
+#                oai_user,
+#                oai_password,
+#                envcomp,
+#                logdir + "/compile_softmodem." + enb_machine)
+#    ret = task.wait()
+#    if ret != 0:
+#        log("ERROR: softmodem compilation failure");
+#        os._exit(1)
+#
+##    #copy wanted configuration file
+##    quickshell("sshpass -p " + oai_password +
+##               " scp config/enb.band7.tm1.usrpb210.conf " +
+##                     oai_user + "@" + enb_machine + ":/tmp/enb.conf")
+#
+#    #run softmodem
+#    log("INFO: " + id + ": run softmodem")
+#    task_enb = Task("actions/run_enb.bash",
+#                    "run softmodem",
+#                    enb_machine,
+#                    oai_user,
+#                    oai_password,
+#                    env,
+#                    logdir + "/run_softmodem." + enb_machine, event=event)
+#    task_enb.waitlog('got sync')
+#
+#    #start UE
+#    log("INFO: " + id + ": start bandrich UE")
+#    task_ue = Task("actions/start_bandrich.bash",
+#                   "start bandrich UE",
+#                   ue_machine,
+#                   oai_user,
+#                   oai_password,
+#                   env,
+#                   logdir + "/start_bandrich." + ue_machine, event=event)
+#    task_ue.waitlog("local  IP address", event=event)
+#
+#    event.wait()
+#
+#    #at this point one task has died or we have the line in the log
+#    if task_ue.waitlog_state != WAITLOG_SUCCESS:
+#        log("ERROR: " + id + ": bandrich UE did not connect")
+#        os._exit(1)
+#
+#    event.clear()
+#
+#    if (    not task_enb.alive() or
+#            not task_hss.alive() or
+#            not task_ue.alive()):
+#        log("ERROR: " + id + ": eNB or UE tasks died")
+#        os._exit(1)
+#
+#    #get bandrich UE IP
+#    l = open(task_ue.logfile, "r").read()
+#    ue_ip = re.search("local  IP address (.*)\n", l).groups()[0]
+#    log("INFO: " + id + ": bandrich UE IP address: " + ue_ip)
+#
+#    #run traffic
+#    log("INFO: " + id + ": run downlink TCP traffic")
+#
+#    log("INFO: " + id + ":     launch server")
+#    task_traffic_ue = Task("actions/downlink_bandrich.bash",
+#                           "start iperf on bandrich UE as server",
+#                           ue_machine,
+#                           oai_user,
+#                           oai_password,
+#                           env,
+#                           logdir + "/downlink_bandrich." + ue_machine,
+#                           event=event)
+#    task_traffic_ue.waitlog("Server listening on TCP port 5001")
+#
+#    log("INFO: " + id + ":     launch client")
+#    envepc = list(env)
+#    envepc.append("UE_IP=" + ue_ip)
+#    task = Task("actions/downlink_epc.bash",
+#                "start iperf on EPC as client",
+#                epc_machine,
+#                oai_user,
+#                oai_password,
+#                envepc,
+#                logdir + "/downlink_epc." + epc_machine, event=event)
+#    log("INFO: " + id + ":     wait for client (or some error)")
+#
+#    event.wait()
+#    log("DEBUG: event.wait() done")
+#
+#    if (    not task_enb.alive() or
+#            not task_hss.alive() or
+#            not task_ue.alive()):
+#        log("ERROR: unexpected task exited, test failed, kill all")
+#        if task.alive():
+#            task.kill()
+#        if task_enb.alive():
+#            task_enb.kill()
+#        if task_ue.alive():
+#            task_ue.kill()
+#
+#    ret = task.wait()
+#    if ret != 0:
+#        log("ERROR: " + id + ": downlink traffic failed")
+#        #not sure if we have to quit here or not
+#        #os._exit(1)
+#
+#    #stop downlink server
+#    log("INFO: " + id + ":     stop server (kill ssh connection)")
+#    task_traffic_ue.kill()
+#    log("INFO: " + id + ":     wait for server to quit")
+#    task_traffic_ue.wait()
+#
+#    #stop UE
+#    log("INFO: " + id + ": stop bandrich UE")
+#    task_ue.sendnow("%c" % 3)
+#    ret = task_ue.wait()
+#    if ret != 0:
+#        log("ERROR: " + id + ": task bandrich UE failed")
+#        #not sure if we have to quit here or not
+#        #os._exit(1)
+#
+#    #stop softmodem
+#    log("INFO: " + id + ": stop softmodem")
+#    task_enb.sendnow("%c" % 3)
+#    ret = task_enb.wait()
+#    if ret != 0:
+#        log("ERROR: " + id + ": softmodem failed")
+#        #not sure if we have to quit here or not
+#        #os._exit(1)
+#
+#    #stop EPC, wait for disconnection on HSS side
+#    log("INFO: " + id + ": stop EPC")
+#    task = Task("actions/alu_epc_stop.bash",
+#                "ALU EPC stop",
+#                epc_machine,
+#                oai_user,
+#                oai_password,
+#                env,
+#                logdir + "/alu_epc_stop." + epc_machine)
+#    ret = task.wait()
+#    if ret != 0:
+#        log("ERROR: " + id + ": ALU EPC stop failed")
+#        os._exit(1)
+#    task_hss.waitlog('Disconnected\n')
+#
+#    log("INFO: " + id + ": stop HSS")
+#    task_hss.sendnow("exit\n")
+#    ret = task_hss.wait()
+#    if ret != 0:
+#        log("ERROR: " + id + ": ALU HSS failed")
+#        os._exit(1)
+
+import utils
+log(utils.GREEN + "GOODBYE" + utils.RESET)
+#os._exit(0)
+
+#run lte softmodem tests

cmake_targets/autotests/v2/task.py

@@ -0,0 +1,370 @@
+import os, time, threading, sys, os, errno, select
+from connection import connection
+
+import utils
+from utils import log
+
+#this class is to communicate between reader and sender threads
+#the reader increments a count each time it receives the prompt
+#and wakes up the sender
+#it also indicates when it exits so the sender can exit too
+#the sender (calling get) waits for the count to be greated than passed
+#argument or if reader exited
+#it returns argument+1 if things okay, -1 if reader exited
+class Counter:
+    def __init__(self):
+        self.count = 0
+        self.cond = threading.Condition()
+
+    def inc(self):
+        self.cond.acquire()
+        self.count = self.count + 1
+        self.cond.notify()
+        self.cond.release()
+
+    def set(self, value):
+        self.cond.acquire()
+        self.count = value
+        self.cond.notify()
+        self.cond.release()
+
+    def get(self, current):
+        self.cond.acquire()
+        while True:
+            if self.count == -1:
+                ret = -1
+                break
+            if self.count >= current + 1:
+                ret = current + 1
+                break
+            self.cond.wait()
+        self.cond.release()
+        return ret
+
+#this class is used for the main application to wait for some specific
+#output from the remote program (typically the ALU HSS prompt, indicating
+#it is ready and we can proceed further)
+#(too much classes...)
+class ProducerConsumer:
+    def __init__(self):
+        self.count = 0
+        self.cond = threading.Condition()
+
+    def add(self, v):
+        self.cond.acquire()
+        self.count = self.count + v
+        self.cond.notify()
+        self.cond.release()
+
+    def set(self, v):
+        self.cond.acquire()
+        self.count = v
+        self.cond.notify()
+        self.cond.release()
+
+    def get(self, old):
+        self.cond.acquire()
+        while True:
+            if self.count == -1:
+                ret = -1
+                break
+            if self.count > old:
+                ret = self.count
+                break
+            self.cond.wait()
+        self.cond.release()
+        return ret
+
+#this thread gets input from the child process of the task
+#it removes the prompts it gets (be carefully to use a prompt
+#that will not be output of any command otherwise you dead)
+class ReaderThread(threading.Thread):
+    def __init__(self, fdin, logfile, prompt, prompt_counter, producer):
+        threading.Thread.__init__(self)
+        self.fdin = fdin
+        self.logfile = logfile
+        self.prompt_counter = prompt_counter
+        self.prompt = prompt
+        self.promptsize = len(prompt)
+        self.stack = ""
+        self.stacksize = 0
+        self.producer = producer
+
+    def run(self):
+        try:
+            outfile = open(self.logfile, "w")
+        except BaseException, e:
+            log("ERROR: ReaderThread: " + self.logfile + ": " + str(e))
+            os._exit(1)
+        while True:
+            try:
+               (a, b, c) = select.select([ self.fdin ], [], [ self.fdin ])
+            except BaseException, e:
+               log("ERROR: ReaderThread: " + self.logfile +
+                   ": select failed: " + str(e))
+               os._exit(1)
+            try:
+                z = os.read(self.fdin, 1024)
+            except OSError, e:
+                if e.errno == errno.EIO:
+                  #pipe has died, quit the thread
+                  break
+                else:
+                  log("ERROR: ReaderThread: " + self.logfile +
+                      ": unhandled error: " + str(e))
+            except BaseException, e:
+                log("ERROR: ReaderThread: " + self.logfile +
+                    ": unhandled error: " + str(e))
+                break
+            try:
+                produced = 0
+                #this part is to remove the prompt
+                for x in z:
+                    if x == self.prompt[self.stacksize]:
+                        self.stack = self.stack + x
+                        self.stacksize = self.stacksize + 1
+                        if self.stacksize == self.promptsize:
+                            self.prompt_counter.inc()
+                            self.stack = ""
+                            self.stacksize = 0
+                    else:
+                        outfile.write(self.stack)
+                        outfile.write(x)
+                        produced = produced + len(self.stack) + len(x)
+                        self.stack = ""
+                        self.stacksize = 0
+                outfile.flush()
+                self.producer.add(produced)
+            except BaseException, e:
+                log("ERROR: ReaderThread: " + self.logfile + ": " + str(e))
+                os._exit(1)
+        try:
+            outfile.close()
+        except BaseException, e:
+            log("ERROR: ReaderThread: " + self.logfile + ": " + str(e))
+            os._exit(1)
+        #close the pipe, don't care about errors
+        try:
+            os.close(self.fdin)
+        except:
+            pass
+        #signal sender to quit
+        self.prompt_counter.set(-1)
+        self.producer.set(-1)
+
+class SenderQuit(Exception):
+    pass
+
+#this thread sends commands to the child process of the task
+#it waits for the prompt between each command
+#'event' is used for the main thread to wait for one of several tasks
+#to quit, meaning error or end-of-test
+class SenderThread(threading.Thread):
+    def __init__(self, fdout, prompt_counter, connection, env, action,
+                 description, prompt, event=None):
+        threading.Thread.__init__(self)
+        self.fdin = fdout
+        self.prompt_counter = prompt_counter
+        self.connection = connection
+        self.env = env
+        self.action = action
+        self.description = description
+        self.prompt = prompt
+        self.count = 0
+        self.event = event
+        self.alive = True
+
+    def wait_prompt(self):
+        self.count = self.prompt_counter.get(self.count)
+        if self.count == -1:
+            raise SenderQuit()
+
+    def _run(self):
+        self.connection.send('export PS1=' + self.prompt + '\n')
+        self.wait_prompt()
+        self.connection.send('set +o emacs\n')
+        self.wait_prompt()
+        self.connection.send('echo\n')
+        self.wait_prompt()
+        self.connection.send('echo\n')
+        self.wait_prompt()
+        self.connection.send("echo -e '" + utils.GREEN +
+                             '---------------------------------------------'
+                             + utils.RESET + "'\n")
+        self.wait_prompt()
+        self.connection.send('echo\n')
+        self.wait_prompt()
+        self.connection.send("echo -n -e '" + utils.YELLOW +
+                             "COMMANDS START: " +
+                             utils.RESET + "'\n")
+        self.wait_prompt()
+        self.connection.send('date\n')
+        self.wait_prompt()
+
+        for l in self.env:
+            self.connection.send('export ' + l + '\n')
+            self.wait_prompt()
+
+        with open(self.action) as f:
+            for line in f:
+                self.connection.send("echo -n -e '" + utils.GREEN +
+                                     "RUNNING: " + utils.RESET + "'\n")
+                self.wait_prompt()
+                self.connection.send("echo '" +
+                                     line.replace('\n','')
+                                         .replace("'", "'\\''") + "'\n")
+                self.wait_prompt()
+                self.connection.send(line)
+                self.wait_prompt()
+                self.connection.send("if [ $? != 0 ]; then " +
+                                     "echo -e '" + utils.RED +
+                                     "TEST_SETUP_ERROR: " + utils.RESET +
+                                     "last command failed, exiting'; " +
+                                     "date; exit 1; fi\n")
+                self.wait_prompt()
+
+        self.connection.send("echo -n -e '" + utils.YELLOW +
+                             "COMMANDS DONE: " +
+                             utils.RESET + "'\n")
+        self.wait_prompt()
+        self.connection.send('date\n')
+        self.wait_prompt()
+        self.connection.send("echo -e '" + utils.GREEN +
+                             "TEST_SETUP_SUCCESS" + utils.RESET + "'\n")
+        self.wait_prompt()
+        self.connection.send('exit\n')
+
+    def run(self):
+        try:
+            self._run()
+        except SenderQuit:
+            log("WARNING: '" + self.description + "' exits too early?")
+            pass
+        except BaseException, e:
+            log("ERROR: task failed:    " + str(e))
+            log("ERROR: action is:      " + self.action)
+            log("ERROR: description is: " + self.description)
+            os._exit(1)
+
+        self.alive = False
+
+        if self.event != None:
+            self.event.set()
+
+WAITLOG_RUNNING = 0
+WAITLOG_SUCCESS = 1
+WAITLOG_FAILURE = 2
+
+class WaitlogFailed(Exception):
+    pass
+
+#'event' is used by main thread to wait for any of several threads to quit.
+#'Task' passes it the 'SenderThread' above, which sets it when it finishes.
+class Task:
+    def __init__(self, action, description, machine, user, password, env,
+                 logfile, post_action = None, event=None):
+        self.action      = action
+        self.description = description
+        self.machine     = machine
+        self.user        = user
+        self.password    = password
+        self.post_action = post_action
+        self.producer    = ProducerConsumer()
+        self.logfile     = logfile
+
+        prompt = "__OAI_TEST_SETUP_PROMPT__:"
+        prompt_counter = Counter()
+
+        self.connection = connection(description, machine, user, password)
+
+        self.reader = ReaderThread(self.connection.fd, logfile, prompt,
+                                   prompt_counter, self.producer)
+        self.reader.start()
+
+        self.sender = SenderThread(self.connection.fd, prompt_counter,
+                                   self.connection, env, action, description,
+                                   prompt, event)
+        self.sender.start()
+
+    def wait(self, timeout=-1):
+        if self.connection.active == False:
+            return self.connection.retcode
+        try:
+            (pid, ret) = os.waitpid(self.connection.pid, 0)
+        except KeyboardInterrupt, e:
+            log("ERROR: ctrl+c catched! " + str(e))
+            os._exit(1)
+        except BaseException, e:
+            log("ERROR: " + str(e))
+            os._exit(1)
+        self.sender.join()
+        self.reader.join()
+        return ret
+
+    #this function should not be called, it is used internally by 'waitlog'
+    #in mode 'background thread'
+    #TODO: join() the thread at some point
+    def _waitlog_thread(self, task, s):
+        consumed = 0
+        while True:
+            consumed = task.producer.get(consumed)
+            if consumed == -1:
+                log("ERROR: string '" + s + "' not found in logfile " +
+                    task.logfile)
+                task.waitlog_state = WAITLOG_FAILURE
+                task.waitlog_event.set()
+                return
+            if s in open(task.logfile).read():
+                task.waitlog_state = WAITLOG_SUCCESS
+                task.waitlog_event.set()
+                return
+
+    #two ways to wait for a string in the log file:
+    #  - blocking way
+    #  - background thread, using an Event to signal success/failure
+    def waitlog(self, s, event=None):
+        if event != None:
+            self.waitlog_state = WAITLOG_RUNNING
+            self.waitlog_event = event
+            self.waitlog_thread = \
+                threading.Thread(target=self._waitlog_thread,
+                                 args=(self, s))
+            self.waitlog_thread.start()
+            return
+
+        #TODO: optimize, do not process all the file at each wakeup
+        consumed = 0
+        while True:
+            consumed = self.producer.get(consumed)
+            if consumed == -1:
+                log("ERROR: string '" + s + "' not found in logfile " +
+                    self.logfile)
+                raise WaitlogFailed()
+            if s in open(self.logfile).read():
+                return
+
+    def sendnow(self, x):
+        self.connection.send(x)
+
+    def alive(self):
+        return self.sender.alive
+
+    def kill(self):
+        self.connection.kill()
+        #put some error log in logfile, for verbosity
+        try:
+            f = open(self.logfile, "a+")
+            f.write("\n\n" + utils.RED + "TEST_SETUP_ERROR: " + utils.RESET +
+                    "task killed by test setup\n\n");
+            close(f)
+        except BaseException, e:
+            pass
+
+    def postaction(self):
+        if self.post_action != None:
+            out = utils.quickshell(self.post_action)
+            if len(out):
+                log("INFO: task '" + self.description +
+                    "' post_action '" + self.post_action + "' says: ")
+                for l in out.splitlines():
+                    log("INFO:     " + l)

cmake_targets/autotests/v2/utils.py

@@ -0,0 +1,84 @@
+import subprocess, os, thread, sys, time
+
+#logging facitiliy
+#TODO: simplify (a first version redefined stdout, then we replaced 'print'
+#instead, keeping stuff as is)
+class Logger:
+   def __init__(self, stream):
+       self.stream = stream
+       self.start_of_line = True
+       self.lock = thread.allocate_lock()
+       openair_dir = os.environ.get('OPENAIR_DIR')
+       if openair_dir == None:
+           print "FATAL: no OPENAIR_DIR"
+           os._exit(1)
+       try:
+           self.logfile = open(openair_dir +
+                            "/cmake_targets/autotests/log/python.stdout", "w")
+       except BaseException, e:
+           print "FATAL:  cannot create log file"
+           print e
+           os._exit(1)
+   def put(self, data):
+       self.stream.write(data)
+       self.logfile.write(data)
+   def write(self, data):
+       self.lock.acquire()
+       for c in data:
+           if self.start_of_line:
+               self.start_of_line = False
+               t = time.strftime("%H:%M:%S", time.localtime()) + ": "
+               self.stream.write(t)
+               self.logfile.write(t)
+           self.put(c)
+           if c == '\n':
+               self.start_of_line = True
+       self.stream.flush()
+       self.logfile.flush()
+       self.lock.release()
+logger = Logger(sys.stdout)
+def log(x):
+    logger.write(x + "\n")
+
+#check if given test is in list
+#it is in list if one of the strings in 'list' is at the beginning of 'test'
+def test_in_list(test, list):
+    for check in list:
+        check=check.replace('+','')
+        if (test.startswith(check)):
+            return True
+    return False
+
+#run a local command in a shell
+def quickshell(command):
+    process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE,
+                               stderr=subprocess.STDOUT)
+    (retout, reterr) = process.communicate()
+    if (process.returncode != 0):
+        log("ERROR: shell command failed: " + command)
+        if len(retout):
+            log("ERROR: command says: ")
+            for l in retout.splitlines():
+                log("ERROR:     " + l)
+        os._exit(1)
+    return retout
+
+RED="\x1b[31m"
+GREEN="\x1b[32m"
+YELLOW="\x1b[33m"
+RESET="\x1b[m"
+
+#an exception raised when a test fails
+class TestFailed(Exception):
+    pass
+
+#this function returns True if a test in 'x' is set to True
+#to be used as: if do_tests(tests['b210']['alu']) ...
+def do_tests(x):
+    if type(x) == list:
+        for v in x:
+            if do_tests(v): return True
+        return False
+    if type(x) == dict: return do_tests(x.values())
+    if x == True: return True
+    return False

cmake_targets/build_oai

@@ -1,34 +1,25 @@
 #!/bin/bash
-################################################################################
-#
-# Copyright (c) 2015, EURECOM (www.eurecom.fr)
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of the FreeBSD Project.
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file build_oai
 # brief OAI automated build tool that can be used to install, compile, run OAI.
 # author  Navid Nikaein, Lionel GAUTHIER, Laurent Thomas
@@ -44,6 +35,7 @@ source $THIS_SCRIPT_PATH/tools/build_helper
 
 MSC_GEN="False"
 XFORMS="True"
+FLEXRAN_AGENT_SB_IF="True"
 PRINT_STATS="False"
 VCD_TIMING="False"
 DEADLINE_SCHEDULER_FLAG_USER="False"
@@ -62,6 +54,7 @@ BUILD_DOXYGEN=0
 T_TRACER="False"
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE=""
+UE_AUTOTEST_TRACE="False"
 trap handle_ctrl_c INT
 
 function print_help() {
@@ -83,7 +76,7 @@ Options
 --install-optional-packages
    Install useful but not mandatory packages such as valgrind
 -g | --run-with-gdb
-   Add debugging symbols to compilation directives. It also disables any compiler optimization.
+   Add debugging symbols to compilation directives. It also disables any compiler optimization. Only for debugging. Do not use in normal operation!
 -h | --help
    Print this help
 --eNB
@@ -92,6 +85,8 @@ Options
    Makes the UE specific parts (ue_ip, usim, nvram) 
 --RRH
    Makes the RRH
+-a | --agent
+   Enables agent for software-defined control of the eNB
 -r | --3gpp-release
    default is Rel10,
    Rel8 limits the implementation to 3GPP Release 8 version
@@ -136,10 +131,12 @@ Options
    Enables the T tracer.
 --disable-hardware-dependency
    Disable HW dependency during installation
+--ue-autotest-trace
+    Enable specific traces for UE autotest framework
 Usage (first build):
- oaisim (eNB + UE): ./build_oai -I -g --oaisim -x --install-system-files
- Eurecom EXMIMO + COTS UE : ./build_oai -I -g --eNB -x --install-system-files
- NI/ETTUS B201  + COTS UE : ./build_oai -I -g --eNB -x --install-system-files -w USRP
+ oaisim (eNB + UE): ./build_oai -I  --oaisim -x --install-system-files
+ Eurecom EXMIMO + COTS UE : ./build_oai -I  --eNB -x --install-system-files
+ NI/ETTUS B201  + COTS UE : ./build_oai -I  --eNB -x --install-system-files -w USRP
 Usage (Regular):
  oaisim : ./build_oai --oaisim -x 
  Eurecom EXMIMO + OAI ENB : ./build_oai --eNB -x 
@@ -178,6 +175,10 @@ function main() {
             eNB=1
             echo_info "Will compile eNB"
             shift;;
+       -a | --agent)
+	    FLEXRAN_AGENT=1
+	    echo_info "Will compile eNB with agent support"
+	    shift;;
        --UE)
             UE=1
             echo_info "Will compile UE"
@@ -287,6 +288,10 @@ function main() {
             echo_info "Disabling hardware dependency for compiling software"
             DISABLE_HARDWARE_DEPENDENCY="True"
             shift 1;;
+        --ue-autotest-trace)
+            UE_AUTOTEST_TRACE="True"
+            echo_info "Enabling autotest specific trace for UE"
+            shift 1;;
         -h | --help)
             print_help
             exit 1;;
@@ -330,7 +335,7 @@ function main() {
   #By default: EXMIMO: enable
   if [ "$FORCE_DEADLINE_SCHEDULER_FLAG_USER" = "" ]; then
      if [ "$HW" = "EXMIMO" ] ; then 
-        DEADLINE_SCHEDULER_FLAG_USER="False"
+        DEADLINE_SCHEDULER_FLAG_USER="True"
      elif [ "$HW" = "ETHERNET" ] ; then 
         DEADLINE_SCHEDULER_FLAG_USER="False"
      elif [ "$HW" = "OAI_USRP" ] ; then 
@@ -448,6 +453,9 @@ function main() {
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
     echo "set ( XFORMS $XFORMS )"                  >>  $cmake_file
+    if [ "$FLEXRAN_AGENT" = "1" ] ; then
+	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
+    fi
     echo "set ( RRC_ASN1_VERSION \"${REL}\")"      >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )"     >>  $cmake_file
     echo "set ( RF_BOARD \"${HW}\")"               >>  $cmake_file
@@ -456,6 +464,12 @@ function main() {
     echo "set (DEADLINE_SCHEDULER \"${DEADLINE_SCHEDULER_FLAG_USER}\" )"    >>$cmake_file
     echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
     echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
+    echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)"        >>  $cmake_file
+    if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
+     echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
+     echo "set (LINUX True )"              >>  $cmake_file
+     echo "set (PDCP_USE_NETLINK True )"   >>  $cmake_file
+    fi
     echo 'include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)' >> $cmake_file
     cd  $DIR/$lte_build_dir/build
     cmake ..
@@ -561,6 +575,7 @@ function main() {
     compilations \
 	  $lte_build_dir updatefw \
 	  updatefw $dbin/updatefw
+    echo_info "Compiling oarf tools. The logfile for compilation is here: $dlog/oarf.txt"
     make -C $OPENAIR_DIR/cmake_targets/$lte_build_dir/build oarf > $dlog/oarf.txt 2>&1
     cp $OPENAIR_DIR/cmake_targets/$lte_build_dir/build/*.oct $dbin
     if [ -s $dbin/oarf_config_exmimo.oct ] ; then
@@ -589,6 +604,9 @@ function main() {
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( CFLAGS_PROCESSOR_USER \"$CFLAGS_PROCESSOR_USER\" )" >>  $cmake_file
     echo "set ( XFORMS $XFORMS )" >>  $cmake_file
+    if [ "$FLEXRAN_AGENT" = "1" ] ; then
+	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
+    fi
     echo "set ( PRINT_STATS $PRINT_STATS )" >>  $cmake_file
     echo "set ( RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
@@ -648,15 +666,18 @@ function main() {
 	    CMakeFiles/nasmesh/nasmesh.ko $dbin/nasmesh.ko
 
 	#oai_nw_drv
-	compilations \
-	    $oaisim_build_dir oai_nw_drv \
-	    CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
+	#compilations \
+	#    $oaisim_build_dir oai_nw_drv \
+	#    CMakeFiles/oai_nw_drv/oai_nw_drv.ko $dbin/oai_nw_drv.ko
     fi
 
     cmake_file=$DIR/oaisim_mme_build_oai/CMakeLists.txt
     cp $DIR/oaisim_mme_build_oai/CMakeLists.template $cmake_file
     echo "set ( CMAKE_BUILD_TYPE $CMAKE_BUILD_TYPE )" >> $cmake_file
     echo "set ( XFORMS $XFORMS )" >>  $cmake_file
+    if [ "$FLEXRAN_AGENT" = "1" ] ; then
+	echo "set ( FLEXRAN_AGENT_SB_IF $FLEXRAN_AGENT_SB_IF )"      >>  $cmake_file
+    fi
     echo "set ( RRC_ASN1_VERSION \"${REL}\")" >>  $cmake_file
     echo "set ( ENABLE_VCD_FIFO $VCD_TIMING )" >>  $cmake_file
     echo "set ( T_TRACER $T_TRACER )"        >>  $cmake_file

cmake_targets/oaisim_noS1_build_oai/CMakeLists.template

@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
 
-set (  CMAKE_BUILD_TYPE "RelWithDebInfo" )
 set (  ADDR_CONF False )
 set (  DEBUG_OMG False )
 set (  DISABLE_XER_PRINT False )
@@ -48,7 +47,7 @@ set (  NEW_FFT True )
 set (  NO_RRM True )
 set (  OAI_EMU True )
 set (  OAISIM True )
-set (  OAI_NW_DRIVER_TYPE_ETHERNET True )
+set (  OAI_NW_DRIVER_TYPE_ETHERNET False )
 set (  OAI_NW_DRIVER_USE_NETLINK True )
 set (  OPENAIR1 True )
 set (  OPENAIR2 True )

cmake_targets/tools/asn1tostruct.py

@@ -33,35 +33,26 @@ def printDebug(string):
 
 def outputHeaderToFile(f, filename):
     now = datetime.datetime.now()
-    f.write("""/*******************************************************************************
-
-  Eurecom OpenAirInterface
-  Copyright(c) 1999 - 2013 Eurecom
-
-  This program is free software; you can redistribute it and/or modify it
-  under the terms and conditions of the GNU General Public License,
-  version 2, as published by the Free Software Foundation.
-
-  This program is distributed in the hope it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-  more details.
-
-  You should have received a copy of the GNU General Public License along with
-  this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
-
-  The full GNU General Public License is included in this distribution in
-  the file called "COPYING".
-
-  Contact Information
-  Openair Admin: openair_admin@eurecom.fr
-  Openair Tech : openair_tech@eurecom.fr
-  Forums       : http://forums.eurecom.fr/openairinterface
-  Address      : EURECOM, Campus SophiaTech, 450 Route des Chappes
-                 06410 Biot FRANCE
-
-*******************************************************************************/
+    f.write("""/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
 
 """)
     f.write("/*******************************************************************************\n")

cmake_targets/tools/build_helper

@@ -1,33 +1,24 @@
- ################################################################################
-#
-# Copyright (c) 2015, EURECOM (www.eurecom.fr)
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this
-#    list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-#    this list of conditions and the following disclaimer in the documentation
-#    and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-# The views and conclusions contained in the software and documentation are those
-# of the authors and should not be interpreted as representing official policies,
-# either expressed or implied, of the FreeBSD Project.
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file build_helper
 # brief
 # authors Laurent Thomas, Lionel GAUTHIER
@@ -172,57 +163,42 @@ compilations() {
 # External packages installers
 ############################################
 
-install_nettle_from_source() {
-    nettle_install_log=$OPENAIR_DIR/cmake_targets/log/nettle_install_log.txt
-    echo_info "\nInstalling Nettle. The log file for nettle installation is here: $nettle_install_log "
+install_protobuf_from_source(){
+    protobuf_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_install_log.txt
+    echo_info "\nInstalling Google Protobuf from sources. The log file for Protobuf installation is here: $protobuf_install_log "
     (
     cd /tmp
-    echo "Downloading nettle archive"
-    $SUDO rm -rf /tmp/nettle-2.5.tar.gz* /tmp/nettle-2.5
-    wget http://ftp.nluug.nl/gnu/nettle/nettle-2.5.tar.gz
-    if [ $? -ne 0 ]; then
-      wget ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-2.5.tar.gz
-    fi
-    if [ ! -f nettle-2.5.tar.gz ]; then
-      echo_error "Could not download nettle source files"
-      cd -
-      return
-    fi
-    tar -xzf nettle-2.5.tar.gz
-    cd nettle-2.5/
-    ./configure --disable-openssl --enable-shared --prefix=/usr 
-    echo "Compiling nettle"
+    echo "Downloading protobuf"
+    rm -rf /tmp/protobuf-2.6.1.tar.gz* /tmp/protobuf-2.6.1
+    wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz
+    tar -xzvf protobuf-2.6.1.tar.gz
+    cd protobuf-2.6.1/
+    ./configure
+    echo "Compiling protobuf"
     make -j`nproc`
-    make check 
-    $SUDO make install 
-    ) >& $nettle_install_log
+    $SUDO make install
+    $SUDO ldconfig
+    ) >& $protobuf_install_log
 }
 
-install_gnutls_from_source(){
-    gnutls_install_log=$OPENAIR_DIR/cmake_targets/log/gnutls_install_log.txt
-    echo_info "\nInstalling Gnutls. The log file for Gnutls installation is here: $gnutls_install_log "
+install_protobuf_c_from_source(){
+    protobuf_c_install_log=$OPENAIR_DIR/cmake_targets/log/protobuf_c_install_log.txt
+    echo_info "\nInstalling Google Protobuf_C from sources. The log file for Protobuf_C installation is here: $protobuf_c_install_log "
     (
-    cd /tmp 
-    echo "Downloading gnutls archive"
-    $SUDO rm -rf /tmp/gnutls-3.1.23.tar.xz* /tmp/gnutls-3.1.23
-    wget http://mirrors.dotsrc.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz || \
-      wget ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz
-    if [ ! -f gnutls-3.1.23.tar.xz ]; then
-      echo_error "Could not download gnutls source files"
-      cd -
-      return
-    fi
-    tar -xJf gnutls-3.1.23.tar.xz
-    cd gnutls-3.1.23/
-    ./configure --prefix=/usr
-    echo "Compiling gnutls"
+    cd /tmp
+    echo "Downloading protobuf-c"
+    rm -rf /tmp/protobuf-c
+    git clone https://github.com/protobuf-c/protobuf-c.git
+    cd protobuf-c
+    ./autogen.sh
+    ./configure
+    echo "Compiling protobuf-c"
     make -j`nproc`
-    $SUDO make install 
-    )>& $gnutls_install_log
+    $SUDO make install
+    $SUDO ldconfig
+    ) >& $protobuf_c_install_log
 }
 
-
-
 check_install_usrp_uhd_driver(){
         #first we remove old installation
         $SUDO apt-get remove -y uhd || true
@@ -233,7 +209,7 @@ check_install_usrp_uhd_driver(){
         $SUDO add-apt-repository ppa:ettusresearch/uhd -y
         $SUDO apt-get update
         $SUDO apt-get -y install  python python-tk libboost-all-dev libusb-1.0-0-dev
-        $SUDO apt-get -y install libuhd-dev libuhd003
+        $SUDO apt-get -y install libuhd-dev libuhd003 uhd-host
 }
 
 install_usrp_uhd_driver() {
@@ -283,15 +259,17 @@ check_install_additional_tools (){
         android-tools-adb \
 	wvdial \
         python-numpy \
-    sshpass \
-    nscd \
-    bc \
-    ntp
+        sshpass \
+        nscd \
+        bc \
+        ntp \
+        python-scipy \
+        python-matplotlib
 
     $SUDO pip install paramiko
-    $SUDO pip install pyroute2
+    $SUDO pip install pyroute2 colorama
     $SUDO rm -fr /opt/ssh
-    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gist.github.com/2190472.git /opt/ssh
+    $SUDO GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/ssh.git /opt/ssh
     
     log_netiface=$OPENAIR_DIR/cmake_targets/log/netiface_install_log.txt
     echo_info "Installing Netinterfaces package. The logfile for installation is in $log_netiface"
@@ -382,18 +360,74 @@ check_install_oai_software() {
 	xmlstarlet \
 	python-pip \
 	pydb \
+	libyaml-dev \
 	wget
 
     $SUDO update-alternatives --set liblapack.so /usr/lib/atlas-base/atlas/liblapack.so
     
-    #Sometimes linux headers are not available in apt-get if kernel is custom or new
-    $SUDO apt-get install linux-headers-`uname -r` || true
-    # First we remove gnutls/nettle installation and then install from sources
-    $SUDO apt-get remove -y libgnutls-dev nettle-dev nettle-bin
-    install_nettle_from_source
-    install_gnutls_from_source
+    #Remove old gnutls/nettle installation that was done from sources
+    remove_nettle_from_source
+    
+    $SUDO apt-get install -y nettle-dev nettle-bin
+    remove_gnutls_from_source
 
+    $SUDO apt-get install -y libgnutls-dev
+    
     install_asn1c_from_source
+    $SUDO rm -fr /opt/ssh
+    $SUDO git clone https://gist.github.com/2190472.git /opt/ssh
+    install_protobuf_from_source
+    install_protobuf_c_from_source
+}
+
+### Remove Nettle installation which was done from sources
+remove_nettle_from_source() {
+    nettle_uninstall_log=$OPENAIR_DIR/cmake_targets/log/nettle_uninstall_log.txt
+    echo_info "\nUn-Installing Nettle from sources. The log file for nettle un-installation is here: $nettle_uninstall_log "
+    (
+    $SUDO apt-get remove -y nettle-dev nettle-bin 
+    cd /tmp
+    echo "Downloading nettle archive"
+    $SUDO rm -rf /tmp/nettle-2.5.tar.gz* /tmp/nettle-2.5
+    wget https://ftp.gnu.org/gnu/nettle/nettle-2.5.tar.gz
+    if [ $? -ne 0 ]; then
+      wget ftp://ftp.lysator.liu.se/pub/security/lsh/nettle-2.5.tar.gz
+    fi
+    if [ ! -f nettle-2.5.tar.gz ]; then
+      echo_error "Could not download nettle source files"
+      cd -
+      return
+    fi
+    tar -xzf nettle-2.5.tar.gz
+    cd nettle-2.5/
+    ./configure --disable-openssl --enable-shared --prefix=/usr 
+    $SUDO make uninstall || true 
+    $SUDO ldconfig
+    ) >& $nettle_uninstall_log
+}
+
+### Remove Gnutls from source
+remove_gnutls_from_source(){
+    gnutls_uninstall_log=$OPENAIR_DIR/cmake_targets/log/gnutls_uninstall_log.txt
+    echo_info "\nUn-Installing Gnutls. The log file for Gnutls un-installation is here: $gnutls_uninstall_log "
+    (
+    $SUDO apt-get remove -y libgnutls-dev
+    cd /tmp 
+    echo "Downloading gnutls archive"
+    $SUDO rm -rf /tmp/gnutls-3.1.23.tar.xz* /tmp/gnutls-3.1.23
+    wget http://mirrors.dotsrc.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz || \
+      wget ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/gnutls-3.1.23.tar.xz
+    if [ ! -f gnutls-3.1.23.tar.xz ]; then
+      echo_error "Could not download gnutls source files"
+      cd -
+      return
+    fi
+    tar -xJf gnutls-3.1.23.tar.xz
+    cd gnutls-3.1.23/
+    ./configure --prefix=/usr
+    $SUDO make uninstall || true
+    $SUDO ldconfig
+    )>& $gnutls_uninstall_log
 }
 
 install_asn1c_from_source(){
@@ -401,12 +435,13 @@ install_asn1c_from_source(){
     echo_info "\nInstalling ASN1. The log file for ASN1 installation is here: $asn1_install_log "
     (
     $SUDO rm -rf /tmp/asn1c
-    git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
+    GIT_SSL_NO_VERIFY=true git clone https://gitlab.eurecom.fr/oai/asn1c.git /tmp/asn1c
     cd /tmp/asn1c
     ./configure
     make -j`nproc`
     $SUDO make install
     cd -
+    $SUDO ldconfig
     ) > $asn1_install_log 2>&1
 }
 

cmake_targets/tools/build_test_epc_tools

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file build_test_epc_tools
 # brief
 # author Lionel Gauthier

cmake_targets/tools/example_enb_exmimo_mme_hss.txt

@@ -1,31 +1,24 @@
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file example_enb_exmimo_mme_hss.txt
 # brief
 # author Lionel Gauthier

cmake_targets/tools/example_oaisim_enb_ue_mme_virtual.txt

@@ -1,31 +1,24 @@
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file example_oaisim_enb_ue_mme_virtual.txt
 # brief
 # author Lionel Gauthier

cmake_targets/tools/generate_protobuf

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+function main()
+{
+mkdir -p $1
+
+#echo generate protobuf messages inside $1 $2
+
+c_out=$1
+shift
+proto_path=$1
+shift
+
+protoc-c  --c_out=$c_out --proto_path=$proto_path $*
+#protoc    --cpp_out=$c_out --proto_path=$proto_path $*
+
+}
+
+main "$@"

cmake_targets/tools/indent_source_code

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file indent_source_code
 # brief
 # author Lionel Gauthier

cmake_targets/tools/init_exmimo2

@@ -1,33 +1,26 @@
 #!/bin/bash
 
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2015 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file init_nas_nos1
 # brief loads the nasmesh module and sets up the radio bearers (used to provide ip interface without S1 interface)
 # author Florian Kaltenberger
@@ -71,15 +64,7 @@ if [ ! -e /dev/openair0 ]; then
  sudo chmod a+rw /dev/openair0
 fi
 
-DEVICE=`echo $PCI | awk -F\" '{print $(NF-1)}' | awk '{print $2}'`
-DEVICE_SWID=${DEVICE:2:2}
-if [ $DEVICE_SWID == '0a' ]; then
-   echo "Using firware version 10"
    $OPENAIR_DIR/targets/bin/updatefw -s 0x43fffff0 -b -f $OPENAIR_TARGETS/ARCH/EXMIMO/USERSPACE/OAI_FW_INIT/sdr_expressmimo2_v10
-else
-   echo 'No corresponding firmware found'
-   return
-fi
 }
 
 main "$@"

cmake_targets/tools/init_nas_nos1

@@ -1,33 +1,26 @@
 #!/bin/bash
 
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2015 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file init_nas_nos1
 # brief loads the nasmesh module and sets up the radio bearers (used to provide ip interface without S1 interface)
 # author Florian Kaltenberger

cmake_targets/tools/init_nas_s1

@@ -0,0 +1,71 @@
+#!/bin/bash
+
+#WARNING: this file may not work properly, be sure to know what you
+#do when using it
+
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+################################################################################
+# file init_nas_s1
+# brief loads the ue_ip module and sets up IP for the UE
+# you may want to edit it to fit your settings (replace oip0 by oipX for
+# instance)
+# author Florian Kaltenberger
+#
+#######################################
+
+LTEIF=oip0
+#OPENAIR_DIR=/home/oai/svn-oai/openair4G
+
+load_module() {
+  mod_name=${1##*/}
+  mod_name=${mod_name%.*}
+  if awk "/$mod_name/ {found=1 ;exit} END {if (found!=1) exit 1}" /proc/modules
+    then
+      echo "module $mod_name already loaded: I remove it first"
+      sudo rmmod $mod_name
+  fi
+  echo loading $mod_name
+  sudo insmod $1
+}
+
+load_module $OPENAIR_DIR/targets/bin/ue_ip.ko
+
+if [ "$1" = "UE" ]; then
+  echo "bring up oip0 interface for UE"
+  ifconfig oip0 up
+fi
+
+ip route flush cache
+sleep 1
+sysctl -w net.ipv4.conf.all.log_martians=1
+echo "Disabling reverse path filtering"
+sysctl -w net.ipv4.conf.all.rp_filter=0
+ip route flush cache
+
+# Check table 200 lte in /etc/iproute2/rt_tables
+fgrep lte /etc/iproute2/rt_tables  > /dev/null 
+if [ $? -ne 0 ]; then
+    echo "200 lte " >> /etc/iproute2/rt_tables
+fi
+ip rule add fwmark 1 table lte
+ip route add default dev $LTEIF table lte

cmake_targets/tools/make_agent_cache

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+CACHE_DIR=/mnt/oai_agent_cache
+
+if [ ! -d $CACHE_DIR ]; then
+    echo "Creating cache dir in $CACHE_DIR"
+    sudo mkdir $CACHE_DIR
+fi
+
+if grep -qs "$CACHE_DIR" /proc/mounts; then
+    echo "Agent cache is already mounted"
+else
+    echo "Agent cache was not mounted"
+    echo "Mounting..."
+    sudo mount -o size=100m -t tmpfs none "$CACHE_DIR"
+    if [ $? -eq 0 ]; then
+	echo "Mount success"
+    else
+	echo "Something went wrong with the mount"
+    fi
+fi

cmake_targets/tools/perf_oai.bash

@@ -1,31 +1,24 @@
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2015 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file build_oai.bash
 # brief apply a traffic generator, send traffic and measure the performance of OAI
 # OTG is mainly used for OASIM and D-ITG (or iperf) for LTE-SOFTMODEM

cmake_targets/tools/run_enb_s1_exmimo

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file run_enb_s1_exmimo
 # brief run script for eNB EXMIMO.
 # author  Lionel GAUTHIER

cmake_targets/tools/run_enb_s1_usrp

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) anylater version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file run_enb_s1_usrp
 # brief run script for eNB USRP.
 # author  Lionel GAUTHIER and Navid Nikaein

cmake_targets/tools/run_enb_ue_virt_noS1

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file start_enb_ue_virt_noS1
 # brief
 # author Lionel Gauthier

cmake_targets/tools/run_enb_ue_virt_s1

@@ -1,32 +1,25 @@
 #!/bin/bash
-################################################################################
-#   OpenAirInterface
-#   Copyright(c) 1999 - 2014 Eurecom
-#
-#    OpenAirInterface is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#
-#    OpenAirInterface is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with OpenAirInterface.The full GNU General Public License is
-#    included in this distribution in the file called "COPYING". If not,
-#    see <http://www.gnu.org/licenses/>.
-#
-#  Contact Information
-#  OpenAirInterface Admin: openair_admin@eurecom.fr
-#  OpenAirInterface Tech : openair_tech@eurecom.fr
-#  OpenAirInterface Dev  : openair4g-devel@lists.eurecom.fr
-#
-#  Address      : Eurecom, Campus SophiaTech, 450 Route des Chappes, CS 50193 - 06904 Biot Sophia Antipolis cedex, FRANCE
-#
-################################################################################
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
 # file start_enb_ue_virt_s1
 # brief
 # author Lionel Gauthier

cmake_targets/tools/stop_exmimo2

@@ -1,4 +1,26 @@
 #!/bin/bash
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.0  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+
+# \author Navid Nikaein, Rohit Gupta
 
 echo "This script stops exmimo2 as it might be transmitting signal by itself if lte-softmodem terminates incorrectly"
 

common/utils/COPYING

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2015, EURECOM (www.eurecom.fr)
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are those
- * of the authors and should not be interpreted as representing official policies,
- * either expressed or implied, of the FreeBSD Project.
- */

common/utils/Makefile.inc

@@ -5,14 +5,14 @@ linux := $(shell if [ `uname` = "Linux" ] ; then echo "1" ; else echo "0" ; fi)
 
 
 CFLAGS += -std=gnu99 
-#CFLAGS += -Wall -g -ggdb -Wstrict-prototypes -fno-strict-aliasing 
+CFLAGS += -Wall -g -ggdb -Wstrict-prototypes -fno-strict-aliasing 
 
 # Need to force this option because default kernel module builder is wrong
 CFLAGS += $(call cc-option,-mpreferred-stack-boundary=4)
 
 #For performance, if some option doesn't exist in all gcc versions, use $(call cc-option,MY_OPTION)
-CFLAGS += -O2
-CFLAGS +=  -funroll-loops 
+#CFLAGS += -O2
+#CFLAGS +=  -funroll-loops 
 CFLAGS += -Wno-packed-bitfield-compat 
 
 # This is the minimum CPU faetures for OAI

common/utils/T/README

@@ -0,0 +1,4 @@
+All the files in this directory, unless stated otherwise,
+are released under the terms of the main license of
+OpenAirInterface. See the file LICENSE in the top
+directory.

common/utils/T/T_defs.h

@@ -29,15 +29,15 @@ typedef struct {
 #define T_SHM_FILENAME "/T_shm_segment"
 
 /* number of VCD functions (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_FUNCTIONS 146
+#define VCD_NUM_FUNCTIONS 142
 
 /* number of VCD variables (to be kept up to date! see in T_messages.txt) */
-#define VCD_NUM_VARIABLES 99
+#define VCD_NUM_VARIABLES 107
 
 /* first VCD function (to be kept up to date! see in T_messages.txt) */
 #define VCD_FIRST_FUNCTION    ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)
 
 /* first VCD variable (to be kept up to date! see in T_messages.txt) */
-#define VCD_FIRST_VARIABLE    ((uintptr_t)T_VCD_VARIABLE_FRAME_NUMBER_TX_ENB)
+#define VCD_FIRST_VARIABLE    ((uintptr_t)T_VCD_VARIABLE_FRAME_NUMBER_TX0_ENB)
 
 #endif /* _T_defs_H_ */

common/utils/T/T_messages.txt

@@ -16,7 +16,7 @@ ID = ENB_PHY_DL_TICK
 ID = ENB_PHY_DLSCH_UE_DCI
     DESC = eNodeB downlink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
 ID = ENB_PHY_DLSCH_UE_ACK
     DESC = eNodeB downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
     GROUP = ALL:PHY:GRAPHIC:ENB
@@ -28,7 +28,7 @@ ID = ENB_PHY_DLSCH_UE_NACK
 ID = ENB_PHY_ULSCH_UE_DCI
     DESC = eNodeB uplink UE specific DCI as sent by the PHY layer
     GROUP = ALL:PHY:GRAPHIC:ENB
-    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
 ID = ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION
     DESC = eNodeB uplink UE retransmission due to PHICH NACK (see generate_phich_top)
     GROUP = ALL:PHY:GRAPHIC:ENB
@@ -61,6 +61,18 @@ ID = ENB_PHY_PUCCH_1_ENERGY
     DESC = eNodeB PUCCH 1 energy and threshold
     GROUP = ALL:PHY:GRAPHIC:HEAVY:ENB
     FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,energy : int,threshold
+ID = ENB_PHY_PHICH
+    DESC = eNodeB PHICH
+    GROUP = ALL:PHY:ENB
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,NGROUP : int,NSF : int,ngroup : int,nseq : int,ACK : int,first_rb : int,n_DMRS
+ID = ENB_PHY_MSG3_ALLOCATION
+    DESC = eNodeB Msg3 allocation/reallocation
+    GROUP = ALL:PHY:ENB
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,first_transmission : int,Msg3_frame : int,Msg3_subframe
+ID = ENB_PHY_INITIATE_RA_PROCEDURE
+    DESC = eNodeB initiates a random access procedure after detecting enough energy for one of the preambles
+    GROUP = ALL:PHY:ENB
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,preamble : int,energy : int,delay
 
 #MAC logs
 ID = ENB_MAC_UE_DL_SDU
@@ -70,7 +82,7 @@ ID = ENB_MAC_UE_DL_SDU
 ID = ENB_MAC_UE_UL_SCHEDULE
     DESC = MAC uplink UE scheduling decision
     GROUP = ALL:MAC:ENB
-    FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,mcs : int,first_rb : int,nb_rb : int,TBS
+    FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,mcs : int,first_rb : int,nb_rb : int,TBS : int,ndi
 ID = ENB_MAC_UE_UL_SCHEDULE_RETRANSMISSION
     DESC = MAC uplink UE scheduling retransmission decision
     GROUP = ALL:MAC:ENB
@@ -81,7 +93,7 @@ ID = ENB_MAC_UE_UL_PDU
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu
 ID = ENB_MAC_UE_UL_PDU_WITH_DATA
     DESC = MAC uplink UE received PDU
-    GROUP = ALL:MAC:ENB:HEAVY
+    GROUP = ALL:MAC:ENB
     FORMAT = int,eNB_ID : int,CC_id : int,rnti : int,frame : int,subframe : int,harq_pid : int,sdu_length : int,num_ce : int,num_sdu : buffer,data
 ID = ENB_MAC_UE_UL_SDU
     DESC = MAC uplink UE received SDU
@@ -411,6 +423,27 @@ ID = LEGACY_ENB_APP_TRACE
     GROUP = ALL:LEGACY_ENB_APP:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
+ID = LEGACY_FLEXRAN_AGENT_INFO
+    DESC = FLEXRAN_AGENT legacy logs - info level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_INFO:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_ERROR
+    DESC = FLEXRAN_AGENT legacy logs - error level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_ERROR:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_WARNING
+    DESC = FLEXRAN_AGENT legacy logs - warning level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_WARNING:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_DEBUG
+    DESC = FLEXRAN_AGENT legacy logs - debug level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_DEBUG:LEGACY
+    FORMAT = string,log
+ID = LEGACY_FLEXRAN_AGENT_TRACE
+    DESC = FLEXRAN_AGENT legacy logs - trace level
+    GROUP = ALL:LEGACY_FLEXRAN_AGENT:LEGACY_GROUP_TRACE:LEGACY
+    FORMAT = string,log
+
 ID = LEGACY_SCTP_INFO
     DESC = SCTP legacy logs - info level
     GROUP = ALL:LEGACY_SCTP:LEGACY_GROUP_INFO:LEGACY
@@ -772,6 +805,85 @@ ID = LEGACY_CLI_TRACE
     GROUP = ALL:LEGACY_CLI:LEGACY_GROUP_TRACE:LEGACY
     FORMAT = string,log
 
+#################
+#### UE LOGS ####
+#################
+#general logs
+ID = UE_MASTER_TICK
+    DESC = UE master tick - one tick per ms, to be used as "reference clock", mostly for ticktime view
+    GROUP = ALL:GENERAL:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+
+#PHY logs
+ID = UE_PHY_UL_TICK
+    DESC = UE uplink tick - one tick per ms at start of uplink processing
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DL_TICK
+    DESC = UE downlink tick - one tick per ms at start of downlink processing
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe
+ID = UE_PHY_DLSCH_UE_DCI
+    DESC = UE downlink UE specific DCI as sent by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,dci_format : int,harq_pid : int,mcs : int,TBS
+ID = UE_PHY_DLSCH_UE_ACK
+    DESC = UE downlink UE ACK as seen by the PHY layer in process_HARQ_feedback
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_DLSCH_UE_NACK
+    DESC = UE downlink UE NACK as seen by the PHY layer in process_HARQ_feedback
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_DCI
+    DESC = UE uplink UE specific DCI as sent by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid : int,mcs : int,round : int,first_rb : int,nb_rb : int,TBS
+ID = UE_PHY_ULSCH_UE_ACK
+    DESC = UE uplink UE ACK as seen by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_ULSCH_UE_NACK
+    DESC = UE uplink UE NACK as seen by the PHY layer
+    GROUP = ALL:PHY:GRAPHIC:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,UE_id : int,rnti : int,harq_pid
+ID = UE_PHY_INPUT_SIGNAL
+    DESC = UE received signal in the time domain for a duration of 1ms
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,frame : int,subframe : int,antenna : buffer,rxdata
+ID = UE_PHY_DL_CHANNEL_ESTIMATE
+    DESC = UE channel estimation in the time domain
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,antenna : buffer,chest_t
+ID = UE_PHY_PDCCH_IQ
+    DESC = UE PDCCH received IQ data
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,nb_rb : int,NB_RB_DL : int,symbols_per_tti : buffer,rxdataF_comp
+ID = UE_PHY_PDCCH_ENERGY
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdcch_ch_level00 : int,pdcch_ch_level01 : int,pdcch_ch_level10: int,pdcch_ch_level11
+ID = UE_PHY_PDSCH_IQ
+    DESC = UE PDSCH received IQ data
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,nb_rb : int,N_RB_UL : int,symbols_per_tti : buffer,pusch_comp
+ID = UE_PHY_PDSCH_ENERGY
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,pdsch_ch_level00 : int,pdsch_ch_level01 : int,pdsch_ch_level10: int,pdsch_ch_level11
+ID = UE_PHY_PUSCH_TX_POWER
+    DESC = UE PUSCH  tx power
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pusch : int,ampl: int,g_pusch: int,pl: int,nb_rb
+ID = UE_PHY_PUCCH_TX_POWER
+    DESC = UE PDSCH 1 energy and threshold
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_id : int,frame : int,subframe : int,p0_pucch : int,ampl: int,g_pucch: int,pl
+ID = UE_PHY_MEAS
+    DESC = UE PHY measurements
+    GROUP = ALL:PHY:GRAPHIC:HEAVY:UE
+    FORMAT = int,eNB_ID : int,UE_ID : int,frame : int,subframe : int,rsrp : int,rssi : int,snr: int,rx_power: int,noise_power: int,w_cqi: int,freq_offset
+
 #for debug/test - not used
 ID = first
 ID = buf_test
@@ -806,12 +918,36 @@ ID = buf_test
 
 #variables
 
-ID = VCD_VARIABLE_FRAME_NUMBER_TX_ENB
-    DESC = VCD variable FRAME_NUMBER_TX_ENB
+ID = VCD_VARIABLE_FRAME_NUMBER_TX0_ENB
+    DESC = VCD variable FRAME_NUMBER_TX0_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX_ENB
-    DESC = VCD variable FRAME_NUMBER_RX_ENB
+ID = VCD_VARIABLE_FRAME_NUMBER_TX1_ENB
+    DESC = VCD variable FRAME_NUMBER_TX1_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX0_ENB
+    DESC = VCD variable FRAME_NUMBER_RX0_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_FRAME_NUMBER_RX1_ENB
+    DESC = VCD variable FRAME_NUMBER_RX1_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_ENB
+    DESC = VCD variable SUBFRAME_NUMBER_TX0_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_ENB
+    DESC = VCD variable SUBFRAME_NUMBER_TX1_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_ENB
+    DESC = VCD variable SUBFRAME_NUMBER_RX0_ENB
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_ENB
+    DESC = VCD variable SUBFRAME_NUMBER_RX1_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_RUNTIME_TX_ENB
@@ -822,28 +958,36 @@ ID = VCD_VARIABLE_RUNTIME_RX_ENB
     DESC = VCD variable RUNTIME_RX_ENB
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_TX_UE
-    DESC = VCD variable FRAME_NUMBER_TX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_TX0_UE
+    DESC = VCD variable FRAME_NUMBER_TX0_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_FRAME_NUMBER_RX_UE
-    DESC = VCD variable FRAME_NUMBER_RX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_TX1_UE
+    DESC = VCD variable FRAME_NUMBER_TX1_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SLOT_NUMBER_TX_UE
-    DESC = VCD variable SLOT_NUMBER_TX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_RX0_UE
+    DESC = VCD variable FRAME_NUMBER_RX0_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SLOT_NUMBER_RX_UE
-    DESC = VCD variable SLOT_NUMBER_RX_UE
+ID = VCD_VARIABLE_FRAME_NUMBER_RX1_UE
+    DESC = VCD variable FRAME_NUMBER_RX1_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX_UE
-    DESC = VCD variable SUBFRAME_NUMBER_TX_UE
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX0_UE
+    DESC = VCD variable SUBFRAME_NUMBER_TX0_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
-ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX_UE
-    DESC = VCD variable SUBFRAME_NUMBER_RX_UE
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_TX1_UE
+    DESC = VCD variable SUBFRAME_NUMBER_TX1_UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX0_UE
+    DESC = VCD variable SUBFRAME_NUMBER_RX0_UE
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_SUBFRAME_NUMBER_RX1_UE
+    DESC = VCD variable SUBFRAME_NUMBER_RX1_UE
     GROUP = ALL:VCD:UE:VCD_VARIABLE
     FORMAT = ulong,value
 ID = VCD_VARIABLE_MISSED_SLOTS_ENB
@@ -898,6 +1042,10 @@ ID = VCD_VARIABLE_TRX_TST
     DESC = VCD variable TRX_TST
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
+ID = VCD_VARIABLE_TRX_WRITE_FLAGS
+    DESC = VCD variable TRX_WRITE_FLAGS
+    GROUP = ALL:VCD:ENB:VCD_VARIABLE
+    FORMAT = ulong,value
 ID = VCD_VARIABLE_TX_TS
     DESC = VCD variable TX_TS
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
@@ -1202,6 +1350,30 @@ ID = VCD_VARIABLE_UE0_SFN7
     DESC = VCD variable UE0_SFN7
     GROUP = ALL:VCD:ENB:VCD_VARIABLE
     FORMAT = ulong,value
+ID = VCD_VARIABLE_UE_PDCP_FLUSH_SIZE
+    DESC = VCD variable UE_PDCP_FLUSH_SIZE
+    GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE_PDCP_FLUSH_ERR
+    DESC = VCD variable UE_PDCP_FLUSH_ERR
+    GROUP = ALL:VCD:ENB:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_READ_NS
+    DESC = VCD variable UE0_TRX_READ_NS
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_WRITE_NS
+    DESC = VCD variable UE0_TRX_WRITE_NS
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_READ_NS_MISSING
+    DESC = VCD variable UE0_TRX_READ_NS_MISSING
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
+ID = VCD_VARIABLE_UE0_TRX_WRITE_NS_MISSING
+    DESC = VCD variable UE0_TRX_WRITE_NS_MISSING
+    GROUP = ALL:VCD:UE:VCD_VARIABLE
+    FORMAT = ulong,value
 
 #functions
 
@@ -1217,92 +1389,80 @@ ID = VCD_FUNCTION_TRX_WRITE
     DESC = VCD function TRX_WRITE
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX0
-    DESC = VCD function eNB_PROC_TX0
+ID = VCD_FUNCTION_TRX_READ_IF
+    DESC = VCD function TRX_READ_IF
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX0
-    DESC = VCD function eNB_PROC_RX0
+ID = VCD_FUNCTION_TRX_WRITE_IF
+    DESC = VCD function TRX_WRITE_IF
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX1
-    DESC = VCD function eNB_PROC_TX1
+ID = VCD_FUNCTION_eNB_PROC_RXTX0
+    DESC = VCD function eNB_PROC_RXTX0
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX1
-    DESC = VCD function eNB_PROC_RX1
+ID = VCD_FUNCTION_eNB_PROC_RXTX1
+    DESC = VCD function eNB_PROC_RXTX1
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX2
-    DESC = VCD function eNB_PROC_TX2
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX2
-    DESC = VCD function eNB_PROC_RX2
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX3
-    DESC = VCD function eNB_PROC_TX3
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX3
-    DESC = VCD function eNB_PROC_RX3
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX4
-    DESC = VCD function eNB_PROC_TX4
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX4
-    DESC = VCD function eNB_PROC_RX4
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX5
-    DESC = VCD function eNB_PROC_TX5
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX5
-    DESC = VCD function eNB_PROC_RX5
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX6
-    DESC = VCD function eNB_PROC_TX6
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX6
-    DESC = VCD function eNB_PROC_RX6
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX7
-    DESC = VCD function eNB_PROC_TX7
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX7
-    DESC = VCD function eNB_PROC_RX7
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX8
-    DESC = VCD function eNB_PROC_TX8
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX8
-    DESC = VCD function eNB_PROC_RX8
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_TX9
-    DESC = VCD function eNB_PROC_TX9
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_eNB_PROC_RX9
-    DESC = VCD function eNB_PROC_RX9
-    GROUP = ALL:VCD:ENB:VCD_FUNCTION
-    FORMAT = int,value
-ID = VCD_FUNCTION_UE_THREAD_TX
-    DESC = VCD function UE_THREAD_TX
+ID = VCD_FUNCTION_UE_THREAD_SYNCH
+    DESC = VCD function UE_THREAD_SYNCH
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_UE_THREAD_RX
-    DESC = VCD function UE_THREAD_RX
+ID = VCD_FUNCTION_UE_THREAD_RXTX0
+    DESC = VCD function UE_THREAD_RXTX0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_THREAD_RXTX1
+    DESC = VCD function UE_THREAD_RXTX1
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_TRX_READ_SF9
+    DESC = VCD function TRX_READ_SF9
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_TRX_WRITE_SF9
+    DESC = VCD function TRX_WRITE_SF9
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX0
+    DESC = VCD function UE_SIGNAL_COND_RXTX0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_SIGNAL_COND_RXTX1
+    DESC = VCD function UE_SIGNAL_COND_RXTX1
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_WAIT_COND_RXTX0
+    DESC = VCD function UE_WAIT_COND_RXTX0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_WAIT_COND_RXTX1
+    DESC = VCD function UE_WAIT_COND_RXTX1
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT0
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT1
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_COND_WAIT1
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT0
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT1
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_CNT_DECREMENT1
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT0
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT0
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT1
+    DESC = VCD function UE_LOCK_MUTEX_RXTX_FOR_CNT_INCREMENT1
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_eNB_TX
@@ -1377,8 +1537,28 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX
     DESC = VCD function PHY_PROCEDURES_ENB_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
-ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX
-    DESC = VCD function PHY_PROCEDURES_ENB_RX
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_TX1
+    DESC = VCD function PHY_PROCEDURES_ENB_TX1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_COMMON1
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_COMMON1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_RX_UESPEC1
+    DESC = VCD function PHY_PROCEDURES_ENB_RX_UESPEC1
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_ENB_SLOT_FEP
+    DESC = VCD function ENB_SLOT_FEP
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX
@@ -1389,6 +1569,26 @@ ID = VCD_FUNCTION_PHY_PROCEDURES_UE_RX
     DESC = VCD function PHY_PROCEDURES_UE_RX
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
+    DESC = VCD function PHY_PROCEDURES_UE_TX_ULSCH_UESPEC
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_PUCCH
+    DESC = VCD function PHY_PROCEDURES_UE_TX_PUCCH
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_ULSCH_COMMON
+    DESC = VCD function PHY_PROCEDURES_UE_TX_ULSCH_COMMON
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_PRACH
+    DESC = VCD function PHY_PROCEDURES_UE_TX_PRACH
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PHY_PROCEDURES_UE_TX_ULSCH_RAR
+    DESC = VCD function PHY_PROCEDURES_UE_TX_ULSCH_RAR
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_PROCEDURES_ENB_LTE
     DESC = VCD function PHY_PROCEDURES_ENB_LTE
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1477,6 +1677,22 @@ ID = VCD_FUNCTION_RX_PHICH
     DESC = VCD function RX_PHICH
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_PDSCH_PROC
+    DESC = VCD function PDSCH_PROC
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDSCH_PROC_SI
+    DESC = VCD function PDSCH_PROC_SI
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDSCH_PROC_P
+    DESC = VCD function PDSCH_PROC_P
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDSCH_PROC_RA
+    DESC = VCD function PDSCH_PROC_RA
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_PHY_UE_CONFIG_SIB2
     DESC = VCD function PHY_UE_CONFIG_SIB2
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1561,6 +1777,10 @@ ID = VCD_FUNCTION_UE_ULSCH_ENCODING
     DESC = VCD function UE_ULSCH_ENCODING
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_UE_ULSCH_ENCODING_FILL_CQI
+    DESC = VCD function UE_ULSCH_ENCODING_FILL_CQI
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_UE_ULSCH_SCRAMBLING
     DESC = VCD function UE_ULSCH_SCRAMBLING
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1573,10 +1793,22 @@ ID = VCD_FUNCTION_ENB_DLSCH_ENCODING
     DESC = VCD function ENB_DLSCH_ENCODING
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_ENB_DLSCH_ENCODING_W
+    DESC = VCD function ENB_DLSCH_ENCODING_W
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_ENB_DLSCH_SCRAMBLING
     DESC = VCD function ENB_DLSCH_SCRAMBLING
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_ENB_BEAM_PRECODING
+    DESC = VCD function ENB_BEAM_PRECODING
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_ENB_OFDM_MODULATION
+    DESC = VCD function ENB_OFDM_MODULATION
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_MACPHY_INIT
     DESC = VCD function MACPHY_INIT
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1645,6 +1877,10 @@ ID = VCD_FUNCTION_UE_DECODE_SI
     DESC = VCD function UE_DECODE_SI
     GROUP = ALL:VCD:UE:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_UE_DECODE_PCCH
+    DESC = VCD function UE_DECODE_PCCH
+    GROUP = ALL:VCD:UE:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_UE_DECODE_CCCH
     DESC = VCD function UE_DECODE_CCCH
     GROUP = ALL:VCD:UE:VCD_FUNCTION
@@ -1685,6 +1921,10 @@ ID = VCD_FUNCTION_RLC_DATA_REQ
     DESC = VCD function RLC_DATA_REQ
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+#ID = VCD_FUNCTION_RLC_DATA_IND
+#    DESC = VCD function RLC_DATA_IND
+#    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+#    FORMAT = int,value
 ID = VCD_FUNCTION_MAC_RLC_STATUS_IND
     DESC = VCD function MAC_RLC_STATUS_IND
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1729,6 +1969,22 @@ ID = VCD_FUNCTION_PDCP_VALIDATE_SECURITY
     DESC = VCD function PDCP_VALIDATE_SECURITY
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_READ
+    DESC = VCD function PDCP_FIFO_READ
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_READ_BUFFER
+    DESC = VCD function PDCP_FIFO_READ_BUFFER
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_FLUSH
+    DESC = VCD function PDCP_FIFO_FLUSH
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_PDCP_FIFO_FLUSH_BUFFER
+    DESC = VCD function PDCP_FIFO_FLUSH_BUFFER
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
 ID = VCD_FUNCTION_RRC_RX_TX
     DESC = VCD function RRC_RX_TX
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
@@ -1789,3 +2045,19 @@ ID = VCD_FUNCTION_TEST
     DESC = VCD function TEST
     GROUP = ALL:VCD:ENB:VCD_FUNCTION
     FORMAT = int,value
+ID = VCD_FUNCTION_SEND_IF4
+    DESC = VCD function SEND_IF4
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_RECV_IF4
+    DESC = VCD function RECV_IF4
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_SEND_IF5
+    DESC = VCD function SEND_IF5
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value
+ID = VCD_FUNCTION_RECV_IF5
+    DESC = VCD function RECV_IF5
+    GROUP = ALL:VCD:ENB:VCD_FUNCTION
+    FORMAT = int,value

common/utils/T/tracer/Makefile

@@ -5,7 +5,7 @@ CFLAGS=-Wall -g -pthread -DT_TRACER -I.
 
 LIBS=-lX11 -lm -lpng -lXft
 
-all: record replay extract_config textlog enb vcd macpdu2wireshark
+all: record replay extract_config textlog enb ue vcd macpdu2wireshark
 
 record: utils.o record.o database.o config.o
 	$(CC) $(CFLAGS) -o record $^ $(LIBS)
@@ -26,6 +26,11 @@ enb: utils.o enb.o database.o event.o handler.o config.o \
          filter/filter.a
 	$(CC) $(CFLAGS) -o enb $^ $(LIBS)
 
+ue: utils.o ue.o database.o event.o handler.o config.o \
+         event_selector.o view/view.a gui/gui.a logger/logger.a \
+         filter/filter.a
+	$(CC) $(CFLAGS) -o ue $^ $(LIBS)
+
 vcd: utils.o vcd.o database.o event.o handler.o config.o \
          event_selector.o view/view.a gui/gui.a logger/logger.a \
          filter/filter.a

common/utils/T/tracer/enb.c

@@ -24,6 +24,30 @@ typedef struct {
   view *pdcpview;
   view *rrcview;
   view *legacy;
+  widget *current_ue_label;
+  widget *prev_ue_button;
+  widget *next_ue_button;
+  widget *pusch_iq_ue_xy_plot;
+  widget *ul_estimate_ue_xy_plot;
+  widget *pucch1_energy_ue_xy_plot;
+  widget *pucch_iq_ue_xy_plot;
+  widget *dl_ul_harq_ue_label;
+  widget *dl_mcs_xy_plot;
+  widget *ul_mcs_xy_plot;
+  logger *pusch_iq_ue_logger;
+  logger *ul_estimate_ue_logger;
+  logger *pucch1_energy_ue_threshold_logger;
+  logger *pucch1_energy_ue_energy_logger;
+  logger *pucch_iq_ue_logger;
+  logger *dl_dci_logger[8];
+  logger *dl_ack_logger[8];
+  logger *dl_nack_logger[8];
+  logger *ul_dci_logger[8];
+  logger *ul_dci_retransmission_logger[8];
+  logger *ul_ack_logger[8];
+  logger *ul_nack_logger[8];
+  logger *dl_mcs_logger;
+  logger *ul_mcs_logger;
 } enb_gui;
 
 typedef struct {
@@ -31,6 +55,9 @@ typedef struct {
   int *is_on;
   int nevents;
   pthread_mutex_t lock;
+  enb_gui *e;
+  int ue;                /* what UE is displayed in the UE specific views */
+  void *database;
 } enb_data;
 
 void is_on_changed(void *_d)
@@ -86,18 +113,109 @@ static void *gui_thread(void *_g)
   return NULL;
 }
 
-static filter *ticktime_filter(void *database, char *event, int i)
+static filter *ticktime_filter(void *database, char *event, int i, int ue)
 {
   /* filter is "harq_pid == i && UE_id == 0 && eNB_id == 0" */
   return
     filter_and(
       filter_eq(filter_evarg(database, event, "harq_pid"), filter_int(i)),
       filter_and(
-        filter_eq(filter_evarg(database, event, "UE_id"), filter_int(0)),
+        filter_eq(filter_evarg(database, event, "UE_id"), filter_int(ue)),
         filter_eq(filter_evarg(database, event, "eNB_ID"), filter_int(0))));
 }
 
-static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
+static void set_current_ue(gui *g, enb_data *e, int ue)
+{
+  int i;
+  char s[256];
+
+  sprintf(s, "[UE %d]  ", ue);
+  label_set_text(g, e->e->current_ue_label, s);
+  sprintf(s, "PUSCH IQ [UE %d]", ue);
+  xy_plot_set_title(g, e->e->pusch_iq_ue_xy_plot, s);
+  sprintf(s, "UL estimated channel [UE %d]", ue);
+  xy_plot_set_title(g, e->e->ul_estimate_ue_xy_plot, s);
+  sprintf(s, "PUCCH1 energy (SR) [UE %d]", ue);
+  xy_plot_set_title(g, e->e->pucch1_energy_ue_xy_plot, s);
+  sprintf(s, "PUCCH IQ [UE %d]", ue);
+  xy_plot_set_title(g, e->e->pucch_iq_ue_xy_plot, s);
+  sprintf(s, "DL/UL HARQ (x8) [UE %d]", ue);
+  label_set_text(g, e->e->dl_ul_harq_ue_label, s);
+  sprintf(s, "DL MCS [UE %d]", ue);
+  xy_plot_set_title(g, e->e->dl_mcs_xy_plot, s);
+  sprintf(s, "UL MCS [UE %d]", ue);
+  xy_plot_set_title(g, e->e->ul_mcs_xy_plot, s);
+
+  logger_set_filter(e->e->pusch_iq_ue_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_PUSCH_IQ", "UE_ID"),
+        filter_int(ue)));
+  logger_set_filter(e->e->ul_estimate_ue_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "UE_ID"),
+        filter_int(ue)));
+  logger_set_filter(e->e->pucch1_energy_ue_threshold_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
+        filter_int(ue)));
+  logger_set_filter(e->e->pucch1_energy_ue_energy_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
+        filter_int(ue)));
+  logger_set_filter(e->e->pucch_iq_ue_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
+        filter_int(ue)));
+  for (i = 0; i < 8; i++) {
+    logger_set_filter(e->e->dl_dci_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_DCI", i, ue));
+    logger_set_filter(e->e->dl_ack_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_ACK", i, ue));
+    logger_set_filter(e->e->dl_nack_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_DLSCH_UE_NACK", i, ue));
+    logger_set_filter(e->e->ul_dci_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_DCI", i, ue));
+    logger_set_filter(e->e->ul_dci_retransmission_logger[i],
+        ticktime_filter(e->database,
+            "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i, ue));
+    logger_set_filter(e->e->ul_ack_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_ACK", i, ue));
+    logger_set_filter(e->e->ul_nack_logger[i],
+        ticktime_filter(e->database, "ENB_PHY_ULSCH_UE_NACK", i, ue));
+  }
+  logger_set_filter(e->e->dl_mcs_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_DLSCH_UE_DCI", "UE_id"),
+        filter_int(ue)));
+  logger_set_filter(e->e->ul_mcs_logger,
+      filter_eq(
+        filter_evarg(e->database, "ENB_PHY_ULSCH_UE_DCI", "UE_id"),
+        filter_int(ue)));
+}
+
+static void click(void *private, gui *g,
+    char *notification, widget *w, void *notification_data)
+{
+  int *d = notification_data;
+  int button = d[0];
+  enb_data *ed = private;
+  enb_gui *e = ed->e;
+  int ue = ed->ue;
+
+  if (button != 1) return;
+  if (w == e->prev_ue_button) { ue--; if (ue < 0) ue = 0; }
+  if (w == e->next_ue_button) ue++;
+
+  if (pthread_mutex_lock(&ed->lock)) abort();
+  if (ue != ed->ue) {
+    set_current_ue(g, ed, ue);
+    ed->ue = ue;
+  }
+  if (pthread_mutex_unlock(&ed->lock)) abort();
+}
+
+static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database,
+    enb_data *ed)
 {
   widget *main_window;
   widget *top_container;
@@ -113,7 +231,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   widget *text;
   view *textview;
   int i;
-  widget *w;
+  widget *w, *w2;
   view *v;
   logger *l;
 
@@ -124,7 +242,26 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   line = new_container(g, HORIZONTAL);
   widget_add_child(g, top_container, line, -1);
   logo = new_image(g, openair_logo_png, openair_logo_png_len);
-  widget_add_child(g, line, logo, -1);
+
+  /* logo + prev/next UE buttons */
+  col = new_container(g, VERTICAL);
+  widget_add_child(g, col, logo, -1);
+  w = new_container(g, HORIZONTAL);
+  widget_add_child(g, col, w, -1);
+  w2 = new_label(g, "");
+  widget_add_child(g, w, w2, -1);
+  e->current_ue_label = w2;
+  /* TODO: use button widget, not label widget */
+  w2 = new_label(g, "  [prev UE]  ");
+  widget_add_child(g, w, w2, -1);
+  label_set_clickable(g, w2, 1);
+  e->prev_ue_button = w2;
+  w2 = new_label(g, "  [next UE]  ");
+  widget_add_child(g, w, w2, -1);
+  label_set_clickable(g, w2, 1);
+  e->next_ue_button = w2;
+  widget_add_child(g, line, col, -1);
+
   input_signal_plot = new_xy_plot(g, 256, 55, "input signal", 20);
   widget_add_child(g, line, input_signal_plot, -1);
   xy_plot_set_range(g, input_signal_plot, 0, 7680*10, 20, 70);
@@ -138,21 +275,20 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
       g, input_signal_plot, new_color(g, "#0c0c72"), XY_LOOP_MODE);
   logger_add_view(input_signal_log, input_signal_view);
 
-  /* UE 0 PUSCH IQ data */
-  w = new_xy_plot(g, 55, 55, "PUSCH IQ [UE 0]", 50);
+  /* UE x PUSCH IQ data */
+  w = new_xy_plot(g, 55, 55, "", 50);
+  e->pusch_iq_ue_xy_plot = w;
   widget_add_child(g, line, w, -1);
   xy_plot_set_range(g, w, -1000, 1000, -1000, 1000);
   l = new_iqlog(h, database, "ENB_PHY_PUSCH_IQ", "nb_rb",
       "N_RB_UL", "symbols_per_tti", "pusch_comp");
   v = new_view_xy(100*12*14,10,g,w,new_color(g,"#000"),XY_FORCED_MODE);
   logger_add_view(l, v);
-  logger_set_filter(l,
-      filter_eq(
-        filter_evarg(database, "ENB_PHY_PUSCH_IQ", "UE_ID"),
-        filter_int(0)));
+  e->pusch_iq_ue_logger = l;
 
-  /* UE 0 estimated UL channel */
-  w = new_xy_plot(g, 280, 55, "UL estimated channel [UE 0]", 50);
+  /* UE x estimated UL channel */
+  w = new_xy_plot(g, 280, 55, "", 50);
+  e->ul_estimate_ue_xy_plot = w;
   widget_add_child(g, line, w, -1);
   xy_plot_set_range(g, w, 0, 512*10, -10, 80);
   l = new_framelog(h, database,
@@ -161,43 +297,87 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   framelog_set_update_only_at_sf9(l, 0);
   v = new_view_xy(512*10, 10, g, w, new_color(g, "#0c0c72"), XY_LOOP_MODE);
   logger_add_view(l, v);
-  logger_set_filter(l,
-      filter_eq(
-        filter_evarg(database, "ENB_PHY_UL_CHANNEL_ESTIMATE", "UE_ID"),
-        filter_int(0)));
+  e->ul_estimate_ue_logger = l;
 
-  /* UE 0 PUCCH energy */
-  w = new_xy_plot(g, 128, 55, "PUCCH1 energy (SR) [UE 0]", 50);
+  /* UE x PUCCH energy */
+  w = new_xy_plot(g, 128, 55, "", 50);
+  e->pucch1_energy_ue_xy_plot = w;
   widget_add_child(g, line, w, -1);
   xy_plot_set_range(g, w, 0, 1024*10, -10, 80);
   l = new_ttilog(h, database,
       "ENB_PHY_PUCCH_1_ENERGY", "frame", "subframe", "threshold", 0);
   v = new_view_tti(10, g, w, new_color(g, "#ff0000"));
   logger_add_view(l, v);
-  logger_set_filter(l,
-      filter_eq(
-        filter_evarg(database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
-        filter_int(0)));
+  e->pucch1_energy_ue_threshold_logger = l;
   l = new_ttilog(h, database,
       "ENB_PHY_PUCCH_1_ENERGY", "frame", "subframe", "energy", 1);
   v = new_view_tti(10, g, w, new_color(g, "#0c0c72"));
   logger_add_view(l, v);
-  logger_set_filter(l,
-      filter_eq(
-        filter_evarg(database, "ENB_PHY_PUCCH_1_ENERGY", "UE_ID"),
-        filter_int(0)));
+  e->pucch1_energy_ue_energy_logger = l;
 
-  /* UE 0 PUCCH IQ data */
-  w = new_xy_plot(g, 55, 55, "PUCCH IQ [UE 0]", 50);
+  /* UE x PUCCH IQ data */
+  w = new_xy_plot(g, 55, 55, "", 50);
+  e->pucch_iq_ue_xy_plot = w;
   widget_add_child(g, line, w, -1);
-  xy_plot_set_range(g, w, -100, 100, -100, 100);
+  xy_plot_set_range(g, w, -2000, 2000, -2000, 2000);
   l = new_iqdotlog(h, database, "ENB_PHY_PUCCH_1AB_IQ", "I", "Q");
   v = new_view_xy(500, 10, g, w, new_color(g,"#000"), XY_LOOP_MODE);
   logger_add_view(l, v);
-  logger_set_filter(l,
-      filter_eq(
-        filter_evarg(database, "ENB_PHY_PUCCH_1AB_IQ", "UE_ID"),
-        filter_int(0)));
+  e->pucch_iq_ue_logger = l;
+
+  /* UE x DL mcs */
+  line = new_container(g, HORIZONTAL);
+  widget_add_child(g, top_container, line, -1);
+  w = new_xy_plot(g, 128, 55, "", 20);
+  xy_plot_set_range(g, w, 0, 1024*10, -2, 30);
+  e->dl_mcs_xy_plot = w;
+  widget_add_child(g, line, w, -1);
+  l = new_ticked_ttilog(h, database, "ENB_PHY_DL_TICK", "frame", "subframe",
+      "ENB_PHY_DLSCH_UE_DCI", "mcs", 0, -1);
+  v = new_view_tti(10, g, w, new_color(g, "#0c0c72"));
+  logger_add_view(l, v);
+  e->dl_mcs_logger = l;
+
+  /* UE x UL mcs */
+  w = new_xy_plot(g, 128, 55, "", 20);
+  xy_plot_set_range(g, w, 0, 1024*10, -2, 30);
+  e->ul_mcs_xy_plot = w;
+  widget_add_child(g, line, w, -1);
+  l = new_ticked_ttilog(h, database, "ENB_PHY_DL_TICK", "frame", "subframe",
+      "ENB_PHY_ULSCH_UE_DCI", "mcs", 0, -1);
+  v = new_view_tti(10, g, w, new_color(g, "#0c0c72"));
+  logger_add_view(l, v);
+  e->ul_mcs_logger = l;
+
+  /* UE x DL PHY (truly: DCI) throughput */
+  col = new_container(g, VERTICAL);
+  widget_add_child(g, line, col, -1);
+  w = new_xy_plot(g, 70, 10, "DL PHY [0]", 35);
+  w2 = new_textarea(g, 70, 11, 64);
+  xy_plot_set_range(g, w, 0, 1000, 0, 100000);
+  xy_plot_set_tick_type(g, w, XY_PLOT_SCROLL_TICK);
+  widget_add_child(g, col, w2, -1);
+  widget_add_child(g, col, w, -1);
+  container_set_child_growable(g, col, w, 1);
+  l = new_throughputlog(h, database, "ENB_PHY_DL_TICK", "frame", "subframe",
+      "ENB_PHY_DLSCH_UE_DCI", "TBS");
+  v = new_view_scrolltti(10, g, w, new_color(g, "#0c0c72"), w2);
+  logger_add_view(l, v);
+
+  /* UE x UL PHY (truly: DCI) throughput */
+  col = new_container(g, VERTICAL);
+  widget_add_child(g, line, col, -1);
+  w = new_xy_plot(g, 70, 10, "UL PHY [0]", 35);
+  w2 = new_textarea(g, 70, 11, 64);
+  xy_plot_set_range(g, w, 0, 1000, 0, 100000);
+  xy_plot_set_tick_type(g, w, XY_PLOT_SCROLL_TICK);
+  widget_add_child(g, col, w2, -1);
+  widget_add_child(g, col, w, -1);
+  container_set_child_growable(g, col, w, 1);
+  l = new_throughputlog(h, database, "ENB_PHY_DL_TICK", "frame", "subframe",
+      "ENB_PHY_ULSCH_UE_DCI", "TBS");
+  v = new_view_scrolltti(10, g, w, new_color(g, "#0c0c72"), w2);
+  logger_add_view(l, v);
 
   /* downlink/uplink UE DCIs */
   widget_add_child(g, top_container,
@@ -250,8 +430,8 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   logger_add_view(timelog, subview);
 
   /* harq processes' ticktime view */
-  widget_add_child(g, top_container,
-      new_label(g,"DL/UL HARQ (x8) [UE 0]"), -1);
+  e->dl_ul_harq_ue_label = new_label(g, "");
+  widget_add_child(g, top_container, e->dl_ul_harq_ue_label, -1);
   line = new_container(g, HORIZONTAL);
   widget_add_child(g, top_container, line, -1);
   timeline_plot = new_timeline(g, 512, 2*8+2, 3);
@@ -271,15 +451,14 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   /* tick on UL view */
   subview = new_subview_ticktime(timeview, 9, new_color(g,"#bbb"), 3600*1000);
   logger_add_view(timelog, subview);
-  /* DL harq pids */
+  /* DL DCI */
   for (i = 0; i < 8; i++) {
     timelog = new_ticklog(h, database, "ENB_PHY_DLSCH_UE_DCI",
         "frame", "subframe");
     subview = new_subview_ticktime(timeview, i+1,
         new_color(g,"#55f"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_DLSCH_UE_DCI", i));
+    e->dl_dci_logger[i] = timelog;
   }
   /* DL ACK */
   for (i = 0; i < 8; i++) {
@@ -288,8 +467,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
     subview = new_subview_ticktime(timeview, i+1,
         new_color(g,"#282"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_DLSCH_UE_ACK", i));
+    e->dl_ack_logger[i] = timelog;
   }
   /* DL NACK */
   for (i = 0; i < 8; i++) {
@@ -298,10 +476,9 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
     subview = new_subview_ticktime(timeview, i+1,
         new_color(g,"#f22"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_DLSCH_UE_NACK", i));
+    e->dl_nack_logger[i] = timelog;
   }
-  /* UL harq pids */
+  /* UL DCI/retransmission without DCI */
   for (i = 0; i < 8; i++) {
     /* first transmission */
     timelog = new_ticklog(h, database, "ENB_PHY_ULSCH_UE_DCI",
@@ -309,17 +486,14 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
     subview = new_subview_ticktime(timeview, i+9+1,
         new_color(g,"#55f"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_ULSCH_UE_DCI", i));
+    e->ul_dci_logger[i] = timelog;
     /* retransmission */
     timelog = new_ticklog(h, database,
         "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", "frame", "subframe");
     subview = new_subview_ticktime(timeview, i+9+1,
         new_color(g,"#99f"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database,
-            "ENB_PHY_ULSCH_UE_NO_DCI_RETRANSMISSION", i));
+    e->ul_dci_retransmission_logger[i] = timelog;
   }
   /* UL ACK */
   for (i = 0; i < 8; i++) {
@@ -328,8 +502,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
     subview = new_subview_ticktime(timeview, i+9+1,
         new_color(g,"#282"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_ULSCH_UE_ACK", i));
+    e->ul_ack_logger[i] = timelog;
   }
   /* UL NACK */
   for (i = 0; i < 8; i++) {
@@ -338,8 +511,7 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
     subview = new_subview_ticktime(timeview, i+9+1,
         new_color(g,"#f22"), 3600*1000);
     logger_add_view(timelog, subview);
-    logger_set_filter(timelog,
-        ticktime_filter(database, "ENB_PHY_ULSCH_UE_NACK", i));
+    e->ul_nack_logger[i] = timelog;
   }
 
   /* phy/mac/rlc/pdcp/rrc textlog */
@@ -416,6 +588,10 @@ static void enb_main_gui(enb_gui *e, gui *g, event_handler *h, void *database)
   widget_add_child(g, top_container, text, -1);
   container_set_child_growable(g, top_container, text, 1);
   e->legacy = new_view_textlist(10000, 10, g, text);
+
+  set_current_ue(g, ed, 0);
+  register_notifier(g, "click", e->prev_ue_button, click, ed);
+  register_notifier(g, "click", e->next_ue_button, click, ed);
 }
 
 void view_add_log(view *v, char *log, event_handler *h, void *database,
@@ -495,7 +671,11 @@ int main(int n, char **v)
   g = gui_init();
   new_thread(gui_thread, g);
 
-  enb_main_gui(&eg, g, h, database);
+  enb_data.ue = 0;
+  enb_data.e = &eg;
+  enb_data.database = database;
+
+  enb_main_gui(&eg, g, h, database, &enb_data);
 
   for (i = 0; i < number_of_events; i++) {
     logger *textlog;
@@ -525,9 +705,9 @@ int main(int n, char **v)
   on_off(database, "ENB_PHY_PUCCH_1_ENERGY", is_on, 1);
   on_off(database, "ENB_PHY_PUCCH_1AB_IQ", is_on, 1);
 
-  on_off(database, "LEGACY_RRC_INFO", is_on, 1);
-  on_off(database, "LEGACY_RRC_ERROR", is_on, 1);
-  on_off(database, "LEGACY_RRC_WARNING", is_on, 1);
+  on_off(database, "LEGACY_GROUP_INFO", is_on, 1);
+  on_off(database, "LEGACY_GROUP_ERROR", is_on, 1);
+  on_off(database, "LEGACY_GROUP_WARNING", is_on, 1);
 
   view_add_log(eg.phyview, "ENB_PHY_DLSCH_UE_DCI", h, database, is_on);
   view_add_log(eg.phyview, "ENB_PHY_DLSCH_UE_ACK", h, database, is_on);
@@ -639,7 +819,9 @@ restart:
     event e;
     e = get_event(enb_data.socket, v, database);
     if (e.type == -1) goto restart;
+    if (pthread_mutex_lock(&enb_data.lock)) abort();
     handle_event(h, e);
+    if (pthread_mutex_unlock(&enb_data.lock)) abort();
   }
 
   return 0;

common/utils/T/tracer/filter/filter.c

@@ -13,6 +13,7 @@ struct filter {
   } v;
 
   int (*eval)(struct filter *this, event e);
+  void (*free)(struct filter *this);
 };
 
 /****************************************************************************/
@@ -52,7 +53,23 @@ int eval_evarg(struct filter *f, event e)
 }
 
 /****************************************************************************/
-/*                     filter construction functions                        */
+/*                     free memory functions                                */
+/****************************************************************************/
+
+void free_op2(struct filter *f)
+{
+  free_filter(f->v.op2.a);
+  free_filter(f->v.op2.b);
+  free(f);
+}
+
+void free_noop(struct filter *f)
+{
+  free(f);
+}
+
+/****************************************************************************/
+/*                     filter construction/destruction functions            */
 /****************************************************************************/
 
 filter *filter_and(filter *a, filter *b)
@@ -60,6 +77,7 @@ filter *filter_and(filter *a, filter *b)
   struct filter *ret = calloc(1, sizeof(struct filter));
   if (ret == NULL) abort();
   ret->eval = eval_and;
+  ret->free = free_op2;
   ret->v.op2.a = a;
   ret->v.op2.b = b;
   return ret;
@@ -70,6 +88,7 @@ filter *filter_eq(filter *a, filter *b)
   struct filter *ret = calloc(1, sizeof(struct filter));
   if (ret == NULL) abort();
   ret->eval = eval_eq;
+  ret->free = free_op2;
   ret->v.op2.a = a;
   ret->v.op2.b = b;
   return ret;
@@ -80,6 +99,7 @@ filter *filter_int(int v)
   struct filter *ret = calloc(1, sizeof(struct filter));
   if (ret == NULL) abort();
   ret->eval = eval_int;
+  ret->free = free_noop;
   ret->v.v = v;
   return ret;
 }
@@ -97,6 +117,7 @@ filter *filter_evarg(void *database, char *event_name, char *varname)
   f = get_format(database, event_id);
 
   ret->eval = eval_evarg;
+  ret->free = free_noop;
   ret->v.evarg.event_type = event_id;
   ret->v.evarg.arg_index = -1;
 
@@ -114,6 +135,14 @@ filter *filter_evarg(void *database, char *event_name, char *varname)
   return ret;
 }
 
+void free_filter(filter *_f)
+{
+  struct filter *f;
+  if (_f == NULL) return;
+  f = _f;
+  f->free(f);
+}
+
 /****************************************************************************/
 /*                     eval function                                        */
 /****************************************************************************/

common/utils/T/tracer/filter/filter.h

@@ -12,4 +12,6 @@ filter *filter_evarg(void *database, char *event_name, char *varname);
 
 int filter_eval(filter *f, event e);
 
+void free_filter(filter *f);
+
 #endif /* _FILTER_H_ */

common/utils/T/tracer/gui/Makefile

@@ -2,8 +2,8 @@ CC=gcc
 CFLAGS=-Wall -g -pthread -I/usr/include/X11/Xft -I/usr/include/freetype2
 
 OBJS=init.o loop.o toplevel_window.o x.o container.o widget.o \
-     gui.o label.o event.o xy_plot.o textlist.o notify.o positioner.o \
-     timeline.o space.o image.o
+     gui.o label.o textarea.o event.o xy_plot.o textlist.o notify.o \
+     positioner.o timeline.o space.o image.o
 
 gui.a: $(OBJS)
 	ar cr gui.a $(OBJS)

common/utils/T/tracer/gui/gui.h

@@ -14,6 +14,10 @@ typedef void widget;
 
 #define DEFAULT_FONT 0
 
+/* tic type for XY plot */
+#define XY_PLOT_DEFAULT_TICK 0
+#define XY_PLOT_SCROLL_TICK  1
+
 /* key modifiers */
 #define KEY_SHIFT   (1<<0)
 #define KEY_CONTROL (1<<1)
@@ -30,6 +34,7 @@ widget *new_toplevel_window(gui *gui, int width, int height, char *title);
 widget *new_container(gui *gui, int vertical);
 widget *new_positioner(gui *gui);
 widget *new_label(gui *gui, const char *text);
+widget *new_textarea(gui *gui, int width, int height, int maxsize);
 widget *new_xy_plot(gui *gui, int width, int height, char *label,
     int vruler_width);
 widget *new_textlist(gui *gui, int width, int nlines, int background_color);
@@ -39,6 +44,9 @@ widget *new_space(gui *gui, int width, int height);
 widget *new_image(gui *gui, unsigned char *data, int length);
 
 void label_set_clickable(gui *gui, widget *label, int clickable);
+void label_set_text(gui *gui, widget *label, char *text);
+
+void textarea_set_text(gui *gui, widget *textarea, char *text);
 
 void container_set_child_growable(gui *_gui, widget *_this,
     widget *child, int growable);
@@ -49,6 +57,8 @@ void xy_plot_set_range(gui *gui, widget *this,
 void xy_plot_set_points(gui *gui, widget *this,
     int plot, int npoints, float *x, float *y);
 void xy_plot_get_dimensions(gui *gui, widget *this, int *width, int *height);
+void xy_plot_set_title(gui *gui, widget *this, char *label);
+void xy_plot_set_tick_type(gui *gui, widget *this, int type);
 
 void textlist_add(gui *gui, widget *this, const char *text, int position,
     int color);

common/utils/T/tracer/gui/gui_defs.h

@@ -31,7 +31,7 @@ extern int volatile gui_logd;
 
 enum widget_type {
   TOPLEVEL_WINDOW, CONTAINER, POSITIONER, TEXT_LIST, XY_PLOT, BUTTON, LABEL,
-  TIMELINE, SPACE, IMAGE
+  TEXTAREA, TIMELINE, SPACE, IMAGE
 };
 
 struct widget_list;
@@ -117,6 +117,7 @@ struct xy_plot_widget {
   int wanted_height;
   struct xy_plot_plot *plots;
   int nplots;
+  int tick_type;
 };
 
 struct timeline_subline {
@@ -141,13 +142,24 @@ struct button_widget {
 
 struct label_widget {
   struct widget common;
-  const char *t;
+  char *t;
   int color;
   int width;         /* as given by the graphic's backend */
   int height;        /* as given by the graphic's backend */
   int baseline;      /* as given by the graphic's backend */
 };
 
+struct textarea_widget {
+  struct widget common;
+  char *t;
+  int tmaxsize;
+  int color;
+  int wanted_width;
+  int wanted_height;
+  int baseline;      /* as given by the graphic's backend */
+  int text_width;    /* as given by the graphic's backend */
+};
+
 struct space_widget {
   struct widget common;
   int wanted_width;

common/utils/T/tracer/gui/label.c

@@ -81,3 +81,21 @@ void label_set_clickable(gui *_g, widget *_this, int clickable)
 
   gunlock(g);
 }
+
+void label_set_text(gui *_g, widget *_this, char *text)
+{
+  struct gui *g = _g;
+  struct label_widget *this = _this;
+
+  glock(g);
+
+  free(this->t);
+  this->t = strdup(text); if (this->t == NULL) OOM;
+
+  x_text_get_dimensions(g->x, DEFAULT_FONT, text,
+      &this->width, &this->height, &this->baseline);
+
+  send_event(g, REPACK, this->common.id);
+
+  gunlock(g);
+}

common/utils/T/tracer/gui/textarea.c

@@ -0,0 +1,83 @@
+#include "gui.h"
+#include "gui_defs.h"
+#include "x.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static void paint(gui *_gui, widget *_w)
+{
+  struct gui *g = _gui;
+  struct textarea_widget *t = _w;
+  LOGD("PAINT textarea '%s'\n", t->t);
+  x_fill_rectangle(g->x, g->xwin, BACKGROUND_COLOR,
+      t->common.x, t->common.y,
+      t->common.width, t->common.height);
+  x_draw_clipped_string(g->x, g->xwin, DEFAULT_FONT, t->color,
+      t->common.x + t->common.width - t->text_width,
+      t->common.y + t->baseline, t->t,
+      t->common.x, t->common.y,
+      t->common.width, t->common.height);
+}
+
+static void hints(gui *_gui, widget *_w, int *width, int *height)
+{
+  struct textarea_widget *t = _w;
+  LOGD("HINTS textarea '%s'\n", t->t);
+  *width = t->wanted_width;
+  *height = t->wanted_height;
+}
+
+widget *new_textarea(gui *_gui, int width, int height, int maxsize)
+{
+  struct gui *g = _gui;
+  struct textarea_widget *w;
+  int _;
+
+  glock(g);
+
+  w = new_widget(g, TEXTAREA, sizeof(struct textarea_widget));
+
+  w->t = calloc(maxsize, 1);
+  if (w->t == NULL) OOM;
+  w->tmaxsize = maxsize;
+  w->wanted_width = width;
+  w->wanted_height = height;
+  w->color = FOREGROUND_COLOR;
+  w->text_width = 0;
+
+  x_text_get_dimensions(g->x, DEFAULT_FONT, "jlM",
+      &_, &_, &w->baseline);
+
+  w->common.paint = paint;
+  w->common.hints = hints;
+
+  gunlock(g);
+
+  return w;
+}
+
+/*************************************************************************/
+/*                             public functions                          */
+/*************************************************************************/
+
+void textarea_set_text(gui *_g, widget *_this, char *text)
+{
+  struct gui *g = _g;
+  struct textarea_widget *this = _this;
+  int _;
+  int len = strlen(text);
+  if (len >= this->tmaxsize) {
+    fprintf(stderr, "ERROR: string '%s' too big for textarea\n", text);
+    return;
+  }
+
+  glock(g);
+
+  strcpy(this->t, text);
+  x_text_get_dimensions(g->x, DEFAULT_FONT, text,
+      &this->text_width, &_, &this->baseline);
+  send_event(g, DIRTY, this->common.id);
+
+  gunlock(g);
+}

common/utils/T/tracer/gui/widget.c

@@ -265,7 +265,7 @@ void widget_dirty(gui *_gui, widget *_this)
 
 static const char *names[] = {
   "TOPLEVEL_WINDOW", "CONTAINER", "POSITIONER", "TEXT_LIST",
-  "XY_PLOT", "BUTTON", "LABEL", "TIMELINE", "SPACE", "IMAGE"
+  "XY_PLOT", "BUTTON", "LABEL", "TEXTAREA", "TIMELINE", "SPACE", "IMAGE"
 };
 const char *widget_name(enum widget_type type)
 {
@@ -277,6 +277,7 @@ const char *widget_name(enum widget_type type)
   case XY_PLOT:
   case BUTTON:
   case LABEL:
+  case TEXTAREA:
   case TIMELINE:
   case SPACE:
   case IMAGE:

common/utils/T/tracer/gui/xy_plot.c

@@ -1,11 +1,20 @@
 #include "gui.h"
 #include "gui_defs.h"
 #include "x.h"
+#include "../utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
 
+#if 0
+/* this version behaves differently when you resize the XY plot. Say
+ * you increase the size. The old (smaller) view is put at the center
+ * of the new view. Everything inside keeps the same size/aspect ratio.
+ * The other version below resizes the old view so that it fully occupies
+ * the new view. It may introduce aspect ratio changes, but usage seems
+ * to suggest it's a better behaviour.
+ */
 static void paint(gui *_gui, widget *_this)
 {
   struct gui *g = _gui;
@@ -70,9 +79,9 @@ static void paint(gui *_gui, widget *_this)
  */
     char v[64];
     int vwidth, dummy;
-    float x = (k * ticstep - allocated_xmin) /
-              (allocated_xmax - allocated_xmin) *
-              (allocated_plot_width - 1);
+    int x = (k * ticstep - allocated_xmin) /
+            (allocated_xmax - allocated_xmin) *
+            (allocated_plot_width - 1);
     x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
         this->common.x + this->vrule_width + x,
         this->common.y + this->common.height - this->label_height * 2,
@@ -85,7 +94,7 @@ static void paint(gui *_gui, widget *_this)
         this->common.y + this->common.height - this->label_height * 2 +
             this->label_baseline,
         v);
-    LOGD("tic k %d val %g x %g\n", k, k * ticstep, x);
+    LOGD("tic k %d val %g x %d\n", k, k * ticstep, x);
   }
 
   /* vertical tics */
@@ -112,9 +121,9 @@ static void paint(gui *_gui, widget *_this)
   for (k = kmin; k <= kmax; k++) {
     char v[64];
     int vwidth, dummy;
-    float y = (k * ticstep - allocated_ymin) /
-              (allocated_ymax - allocated_ymin) *
-              (allocated_plot_height - 1);
+    int y = (k * ticstep - allocated_ymin) /
+            (allocated_ymax - allocated_ymin) *
+            (allocated_plot_height - 1);
     sprintf(v, "%g", k * ticstep);
     x_text_get_dimensions(g->x, DEFAULT_FONT, v, &vwidth, &dummy, &dummy);
     x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
@@ -155,6 +164,184 @@ static void paint(gui *_gui, widget *_this)
     x_plot_points(g->x, g->xwin, this->plots[n].color);
   }
 }
+#endif
+
+static void paint(gui *_gui, widget *_this)
+{
+  struct gui *g = _gui;
+  struct xy_plot_widget *this = _this;
+  int allocated_plot_width;
+  int allocated_plot_height;
+  float pxsize;
+  float ticdist;
+  float tic;
+  float ticstep;
+  int k, kmin, kmax;
+  float allocated_xmin, allocated_xmax;
+  float allocated_ymin, allocated_ymax;
+  int i;
+  int n;
+  char v[64];
+  int vwidth, dummy;
+
+# define FLIP(v) (-(v) + allocated_plot_height-1)
+
+  LOGD("PAINT xy plot xywh %d %d %d %d\n", this->common.x, this->common.y, this->common.width, this->common.height);
+
+//x_draw_rectangle(g->x, g->xwin, 1, this->common.x, this->common.y, this->common.width, this->common.height);
+
+  allocated_plot_width = this->common.width - this->vrule_width;
+  allocated_plot_height = this->common.height - this->label_height * 2;
+
+  if (allocated_plot_width <= 1 || allocated_plot_height <= 1) {
+    WARN("PAINT xy plot: width (%d) or height (%d) is wrong, not painting\n",
+         this->common.width, this->common.height);
+    return;
+  }
+
+  /* plot zone */
+  /* TODO: refine height - height of hrule text may be != from label */
+  x_draw_rectangle(g->x, g->xwin, 1,
+      this->common.x + this->vrule_width,
+      this->common.y,
+      this->common.width - this->vrule_width -1, /* -1 to see right border */
+      this->common.height - this->label_height * 2);
+
+  /* horizontal tics */
+  pxsize = (this->xmax - this->xmin) / allocated_plot_width;
+  ticdist = 100;
+  tic = floor(log10(ticdist * pxsize));
+  ticstep = powf(10, tic);
+  allocated_xmin = this->xmin;
+  allocated_xmax = this->xmax;
+  /* adjust tic if too tight */
+  LOGD("pre x ticstep %g\n", ticstep);
+  while (1) {
+    if (ticstep / (allocated_xmax - allocated_xmin)
+                * (allocated_plot_width - 1) > 40) break;
+    ticstep *= 2;
+  }
+  LOGD("post x ticstep %g\n", ticstep);
+  LOGD("xmin/max %g %g width allocated %d alloc xmin/max %g %g ticstep %g\n", this->xmin, this->xmax, allocated_plot_width, allocated_xmin, allocated_xmax, ticstep);
+  kmin = ceil(allocated_xmin / ticstep);
+  kmax = floor(allocated_xmax / ticstep);
+  for (k = kmin; k <= kmax; k++) {
+/*
+    (k * ticstep - allocated_xmin) / (allocated_max - allocated_xmin) =
+    (x - 0) / (allocated_plot_width-1 - 0)
+ */
+    int x = (k * ticstep - allocated_xmin) /
+            (allocated_xmax - allocated_xmin) *
+            (allocated_plot_width - 1);
+    int px;
+    x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
+        this->common.x + this->vrule_width + x,
+        this->common.y + this->common.height - this->label_height * 2,
+        this->common.x + this->vrule_width + x,
+        this->common.y + this->common.height - this->label_height * 2 - 5);
+    sprintf(v, "%g", k * ticstep);
+    x_text_get_dimensions(g->x, DEFAULT_FONT, v, &vwidth, &dummy, &dummy);
+
+    /* do not draw after the widget ('width-1' for if we use 'width'
+     * it is still off by 1 pixel for whatever reason) */
+    px = this->vrule_width + x - vwidth/2;
+    if (px + vwidth > this->common.width-1)
+      px = this->common.width-1 - vwidth;
+
+    x_draw_string(g->x, g->xwin, DEFAULT_FONT, FOREGROUND_COLOR,
+        this->common.x + px,
+        this->common.y + this->common.height - this->label_height * 2 +
+            this->label_baseline,
+        v);
+    LOGD("tic k %d val %g x %d\n", k, k * ticstep, x);
+  }
+
+  /* vertical tics */
+  allocated_ymin = this->ymin;
+  allocated_ymax = this->ymax;
+  switch (this->tick_type) {
+  case XY_PLOT_DEFAULT_TICK:
+    pxsize = (this->ymax - this->ymin) / allocated_plot_height;
+    ticdist = 30;
+    tic = floor(log10(ticdist * pxsize));
+    ticstep = powf(10, tic);
+    /* adjust tic if too tight */
+    LOGD("pre y ticstep %g\n", ticstep);
+    while (1) {
+      if (ticstep / (allocated_ymax - allocated_ymin)
+                  * (allocated_plot_height - 1) > 20) break;
+      ticstep *= 2;
+    }
+    LOGD("post y ticstep %g\n", ticstep);
+    LOGD("ymin/max %g %g height allocated %d alloc "
+         "ymin/max %g %g ticstep %g\n", this->ymin, this->ymax,
+         allocated_plot_height, allocated_ymin, allocated_ymax, ticstep);
+    kmin = ceil(allocated_ymin / ticstep);
+    kmax = floor(allocated_ymax / ticstep);
+    for (k = kmin; k <= kmax; k++) {
+      int y = (k * ticstep - allocated_ymin) /
+              (allocated_ymax - allocated_ymin) *
+              (allocated_plot_height - 1);
+      sprintf(v, "%g", k * ticstep);
+      x_text_get_dimensions(g->x, DEFAULT_FONT, v, &vwidth, &dummy, &dummy);
+      x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
+          this->common.x + this->vrule_width,
+          this->common.y + FLIP(y),
+          this->common.x + this->vrule_width + 5,
+          this->common.y + FLIP(y));
+      x_draw_string(g->x, g->xwin, DEFAULT_FONT, FOREGROUND_COLOR,
+          this->common.x + this->vrule_width - vwidth - 2,
+          this->common.y + FLIP(y)-this->label_height/2+this->label_baseline,
+          v);
+    }
+    break;
+  case XY_PLOT_SCROLL_TICK:
+    /* print only max value, formatted using 'bps' for readability */
+    bps(v, this->ymax, "");
+    x_text_get_dimensions(g->x, DEFAULT_FONT, v, &vwidth, &dummy, &dummy);
+    x_draw_string(g->x, g->xwin, DEFAULT_FONT, FOREGROUND_COLOR,
+        this->common.x + this->vrule_width - vwidth - 2,
+        this->common.y + +this->label_baseline,
+        v);
+    /* vertically divide into 5 */
+    for (k = 1; k < 5; k++) {
+      int y = round((k * (allocated_plot_height - 1)) / 5.);
+      x_draw_line(g->x, g->xwin, FOREGROUND_COLOR,
+          this->common.x + this->vrule_width,
+          this->common.y + y,
+          this->common.x + this->vrule_width + 5,
+          this->common.y + y);
+    }
+    break;
+  } /* swich (this->tick_type) */
+
+  /* label at bottom, in the middle */
+  x_draw_string(g->x, g->xwin, DEFAULT_FONT, FOREGROUND_COLOR,
+      this->common.x + (this->common.width - this->label_width) / 2,
+      this->common.y + this->common.height - this->label_height
+          + this->label_baseline,
+      this->label);
+
+  for (n = 0; n < this->nplots; n++) {
+    /* points */
+    float ax, bx, ay, by;
+    ax = (allocated_plot_width-1) / (allocated_xmax - allocated_xmin);
+    bx = -ax * allocated_xmin;
+    ay = (allocated_plot_height-1) / (allocated_ymax - allocated_ymin);
+    by = -ay * allocated_ymin;
+    for (i = 0; i < this->plots[n].npoints; i++) {
+      int x, y;
+      x = ax * this->plots[n].x[i] + bx;
+      y = ay * this->plots[n].y[i] + by;
+      if (x >= 0 && x < allocated_plot_width &&
+          y >= 0 && y < allocated_plot_height)
+        x_add_point(g->x,
+            this->common.x + this->vrule_width + x,
+            this->common.y + FLIP(y));
+    }
+    x_plot_points(g->x, g->xwin, this->plots[n].color);
+  }
+}
 
 static void hints(gui *_gui, widget *_w, int *width, int *height)
 {
@@ -191,6 +378,7 @@ widget *new_xy_plot(gui *_gui, int width, int height, char *label,
   w->ymax = 1;
   w->plots = NULL;
   w->nplots = 0;
+  w->tick_type = XY_PLOT_DEFAULT_TICK;
 
   w->common.paint = paint;
   w->common.hints = hints;
@@ -290,3 +478,36 @@ void xy_plot_get_dimensions(gui *_gui, widget *_this, int *width, int *height)
 
   gunlock(g);
 }
+
+void xy_plot_set_title(gui *_gui, widget *_this, char *label)
+{
+  struct gui *g = _gui;
+  struct xy_plot_widget *this = _this;
+
+  glock(g);
+
+  free(this->label);
+  this->label = strdup(label); if (this->label == NULL) OOM;
+  /* TODO: be sure calling X there is valid wrt "global model" (we are
+   * not in the "gui thread") */
+  x_text_get_dimensions(g->x, DEFAULT_FONT, label,
+      &this->label_width, &this->label_height, &this->label_baseline);
+
+  send_event(g, REPACK, this->common.id);
+
+  gunlock(g);
+}
+
+void xy_plot_set_tick_type(gui *_gui, widget *_this, int type)
+{
+  struct gui *g = _gui;
+  struct xy_plot_widget *this = _this;
+
+  glock(g);
+
+  this->tick_type = type;
+
+  send_event(g, DIRTY, this->common.id);
+
+  gunlock(g);
+}

common/utils/T/tracer/hacks/Makefile

@@ -3,16 +3,23 @@ CFLAGS=-Wall -g -pthread -DT_TRACER -I. -I..
 
 LIBS=-lX11 -lm -lpng -lXft
 
-all: dump_nack_signal
+all: dump_nack_signal time_meas timeplot
 
 dump_nack_signal: ../utils.o ../database.o ../config.o ../event.o \
                   dump_nack_signal.o
 	$(CC) $(CFLAGS) -o dump_nack_signal $^ $(LIBS)
 
+time_meas: ../utils.o ../database.o ../config.o ../event.o \
+                  time_meas.o
+	$(CC) $(CFLAGS) -o time_meas $^ $(LIBS)
+
+timplot: timeplot.o
+	$(CC) $(CFLAGS) -o timeplot $^ $(LIBS)
+
 .PHONY: all
 
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f *.o core dump_nack_signal
+	rm -f *.o core dump_nack_signal time_meas timeplot

common/utils/T/tracer/hacks/time_meas.c

@@ -0,0 +1,112 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "utils.h"
+#include "event.h"
+#include "database.h"
+#include "config.h"
+#include "../T_defs.h"
+
+void usage(void)
+{
+  printf(
+"options:\n"
+"    -d <database file>        this option is mandatory\n"
+"    -ip <host>                connect to given IP address (default %s)\n"
+"    -p <port>                 connect to given port (default %d)\n",
+  DEFAULT_REMOTE_IP,
+  DEFAULT_REMOTE_PORT
+  );
+  exit(1);
+}
+
+struct timespec time_sub(struct timespec a, struct timespec b)
+{
+  struct timespec ret;
+  if (a.tv_nsec < b.tv_nsec) {
+    ret.tv_nsec = (int64_t)a.tv_nsec - (int64_t)b.tv_nsec + 1000000000;
+    ret.tv_sec = a.tv_sec - b.tv_sec - 1;
+  } else {
+    ret.tv_nsec = a.tv_nsec - b.tv_nsec;
+    ret.tv_sec = a.tv_sec - b.tv_sec;
+  }
+  return ret;
+}
+
+int main(int n, char **v)
+{
+  char *database_filename = NULL;
+  void *database;
+  char *ip = DEFAULT_REMOTE_IP;
+  int port = DEFAULT_REMOTE_PORT;
+  int i;
+  char t;
+  int number_of_events;
+  int socket;
+  int *is_on;
+  int ev_fun;
+  int start_valid = 0;
+  struct timespec start_time, stop_time, delta_time;
+
+  for (i = 1; i < n; i++) {
+    if (!strcmp(v[i], "-h") || !strcmp(v[i], "--help")) usage();
+    if (!strcmp(v[i], "-d"))
+      { if (i > n-2) usage(); database_filename = v[++i]; continue; }
+    if (!strcmp(v[i], "-ip")) { if (i > n-2) usage(); ip = v[++i]; continue; }
+    if (!strcmp(v[i], "-p"))
+      { if (i > n-2) usage(); port = atoi(v[++i]); continue; }
+    usage();
+  }
+
+  if (database_filename == NULL) {
+    printf("ERROR: provide a database file (-d)\n");
+    exit(1);
+  }
+
+  database = parse_database(database_filename);
+
+  load_config_file(database_filename);
+
+  number_of_events = number_of_ids(database);
+  is_on = calloc(number_of_events, sizeof(int));
+  if (is_on == NULL) abort();
+
+  on_off(database, "VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER", is_on, 1);
+
+  ev_fun = event_id_from_name(database,
+      "VCD_FUNCTION_ENB_DLSCH_ULSCH_SCHEDULER");
+
+  socket = connect_to(ip, port);
+
+  t = 1;
+  if (socket_send(socket, &t, 1) == -1 ||
+      socket_send(socket, &number_of_events, sizeof(int)) == -1 ||
+      socket_send(socket, is_on, number_of_events * sizeof(int)) == -1)
+    abort();
+
+  while (1) {
+    char v[T_BUFFER_MAX];
+    event e;
+    int on_off;
+    e = get_event(socket, v, database);
+    if (e.type == -1) break;
+    if (e.type != ev_fun)
+      { printf("unhandled event %d\n", e.type); continue; }
+    on_off = e.e[0].i;
+printf("yo %d\n", on_off);
+    if (on_off == 1) {
+      start_time = e.sending_time;
+      start_valid = 1;
+      continue;
+    }
+    if (on_off != 0) { printf("fatal!\n"); abort(); }
+    if (!start_valid) continue;
+    stop_time = e.sending_time;
+    delta_time = time_sub(stop_time, start_time);
+    fprintf(stderr, "%ld\n",
+        delta_time.tv_sec * 1000000000UL + delta_time.tv_nsec);
+    fflush(stderr);
+  }
+
+  return 0;
+}

common/utils/T/tracer/hacks/timeplot.c

@@ -0,0 +1,84 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <unistd.h>
+#include <string.h>
+
+void RESET(void)
+{ printf("\x1b""c"); fflush(stdout); }
+
+void GOTO(int x, int y)
+{ char s[64];sprintf(s,"\x1b[%d;%dH",y,x);printf("%s",s);fflush(stdout); }
+
+void HIDE_CURSOR(void)
+{ printf("\x1b[?25l"); fflush(stdout); }
+
+void sig(int x)
+{
+  RESET();
+  exit(0);
+}
+
+/* 0: [0-2[
+ * ...
+ * 48: [96-98[
+ * 49: [98-infinity]
+ */
+int bins[50];
+
+#define N 1000
+int data[N];
+
+void plot(void)
+{
+  int i;
+  int max = 0;
+  int vmin = data[0];
+  int vmax = 0;
+  long vavg;
+  memset(bins, 0, sizeof(bins));
+  int binsize_ns = 500;
+
+  vavg = 0;
+
+  for (i = 0; i < N; i++) {
+    if (data[i] < vmin) vmin = data[i];
+    if (data[i] > vmax) vmax = data[i];
+    vavg += data[i];
+    int ms2 = data[i]/binsize_ns;
+    if (ms2 > 49) ms2 = 49;
+    bins[ms2]++;
+    if (bins[ms2] > max) max = bins[ms2];
+  }
+
+  vavg /= N;
+
+  GOTO(1,1);
+  for (i = 0; i < 50; i++) {
+    double binend = (i+1) * binsize_ns / 1000.;
+    int k;
+    int width = bins[i] * 70 / max;
+    /* force at least width of 1 if some point is there */
+    if (bins[i] && width == 0) width = 1;
+    printf("%#5.1f ", binend);
+    for (k = 0; k < width; k++) putchar('#');
+    for (; k < 70; k++) putchar(' ');
+    putchar('\n');
+  }
+  printf("min %d ns    max %d ns    avg %ld ns\n", vmin, vmax, vavg);
+}
+
+int main(void)
+{
+  int i;
+  int pos = 0;
+  signal(SIGINT, sig);
+  RESET();
+  HIDE_CURSOR();
+  while (!feof(stdin)) {
+    for (i=0; i<100; i++) { scanf("%d", &data[pos]); pos++; pos%=N; }
+    plot();
+  }
+  RESET();
+  return 0;
+}

common/utils/T/tracer/logger/Makefile

@@ -2,7 +2,7 @@ CC=gcc
 CFLAGS=-Wall -g -pthread -I..
 
 OBJS=logger.o textlog.o framelog.o ttilog.o timelog.o ticklog.o iqlog.o \
-     iqdotlog.o
+     iqdotlog.o ticked_ttilog.o throughputlog.o
 
 logger.a: $(OBJS)
 	ar cr logger.a $(OBJS)