diff --git a/openair3/EMULATIONS/COPYING b/openair3/EMULATIONS/COPYING
deleted file mode 100644
index 94a9ed024d..0000000000
--- a/openair3/EMULATIONS/COPYING
+++ /dev/null
@@ -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>.
diff --git a/openair3/EMULATIONS/INTER/MR1_radvd.conf b/openair3/EMULATIONS/INTER/MR1_radvd.conf
deleted file mode 100644
index 74d2f4d533..0000000000
--- a/openair3/EMULATIONS/INTER/MR1_radvd.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-    # cat /etc/radvd.conf
-    interface eth0
-    {
-          AdvSendAdvert on;
-          AdvIntervalOpt on;
-          AdvHomeAgentFlag on;
-
-          MinRtrAdvInterval 0.1;
-          MaxRtrAdvInterval 0.3;
-
-	  AdvReachableTime 30000;
-	  AdvRetransTimer 500;
-
-          prefix 2001:1::1/64
-          {
-              AdvOnLink on;
-	      AdvValidLifetime 20;
-	      AdvPreferredLifetime 15;
-
-              AdvAutonomous on;
-              AdvRouterAddr on;
-          };
-
-          prefix fec0:1000::1/64
-          {
-              AdvOnLink on;
-             AdvAutonomous on;
-            AdvRouterAddr on;
-
-	      AdvValidLifetime 5;
-	      AdvPreferredLifetime 1;
-         };
-   };
-
diff --git a/openair3/EMULATIONS/INTER/MR2_radvd.conf b/openair3/EMULATIONS/INTER/MR2_radvd.conf
deleted file mode 100644
index c51777cc15..0000000000
--- a/openair3/EMULATIONS/INTER/MR2_radvd.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-    # cat /etc/radvd.conf
-    interface eth0
-    {
-          AdvSendAdvert on;
-          AdvIntervalOpt on;
-          AdvHomeAgentFlag on;
-
-          MinRtrAdvInterval 0.1;
-          MaxRtrAdvInterval 0.3;
-
-	  AdvReachableTime 30000;
-	  AdvRetransTimer 500;
-
-          prefix 2001:1::1/64
-          {
-              AdvValidLifetime 20;
-              AdvPreferredLifetime 15;
-    
-	      AdvOnLink on;
-              AdvAutonomous on;
-              AdvRouterAddr on;
-          };
-
-          prefix fec0:2000::1/64
-          {
-              AdvOnLink on;
-              AdvAutonomous on;
-              AdvRouterAddr on;
-
-	      AdvValidLifetime 10;
-	      AdvPreferredLifetime 1;
-          };
-    };
-
diff --git a/openair3/EMULATIONS/INTER/chorist_inter.xml b/openair3/EMULATIONS/INTER/chorist_inter.xml
deleted file mode 100644
index 99d50c3f91..0000000000
--- a/openair3/EMULATIONS/INTER/chorist_inter.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--DOCTYPE vnuml SYSTEM "/usr/local/share/xml/vnuml/vnuml.dtd"--> 
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-This file describe the Wireless Mesh Network topology for Chorist Project
-Author: 
-	Huu-Nghia.Nguyen@eurecom.fr
-	Christian.Bonnet@eurecom.fr
--->
-
-<vnuml>
-  <global>
-    <version>1.8</version>
-    <simulation_name>chorist_inter</simulation_name>
-    <automac/>
-    <vm_mgmt type="none" />
-    <vm_defaults exec_mode="mconsole">
-  		<filesystem type="cow">/home/Local_Data/nguyenhn/airnet/root_fs.fc6</filesystem>
-	<kernel>/home/Local_Data/nguyenhn/airnet/linux</kernel>
-<!--
-	    <filesystem type="cow">/home/all/root_fs.fc6</filesystem>
-	    <kernel>/home/all/linux</kernel>
--->	
-
-       <console id="0">xterm</console>
-       <console id="1">pts</console>
-       <console id="2">pts</console>
-       <console id="3">pts</console>
-       <console id="4">pts</console>
-       <console id="5">pts</console>
-    </vm_defaults>
-  </global>
-
-  <net name="C1" mode="uml_switch" hub="no" />
-  <net name="C2" mode="uml_switch" hub="no" />
-  <net name="MR1.0" mode="uml_switch" hub="yes" />
-  <net name="MR2.0" mode="uml_switch" hub="yes" />
-  <net name="MN1.0" mode="uml_switch" hub="yes" />
-  <net name="MN2.0" mode="uml_switch" hub="yes" />
-
-  <!-- Correspondent Node -->  
-
-  <vm name="RELAY">
-	  <if id="0" net="C1">
-		  <ipv6>2001:100::3/64</ipv6>
-	  </if>
-
-	  <if id="1" net="C2">
-		  <ipv6>2001:200::3/64</ipv6>
-	  </if>
-  </vm>
-  
-  <!-- Cluster Heads -->
-  <vm name="CH1">
-	  <if id="0" net="C1">
-		  <ipv6>2001:100::1/64</ipv6>
-	  </if>
-
-	  <route type="ipv6" gw="2001:100::3">2001:200::/64</route> <!-- forward to RELAY to Cluster2-->
-	  <route type="ipv6" gw="2001:100::2">2001:1::1/128</route> <!-- forward to MR1 to MR1.IF0 -->
-	  <forwarding type="ip"/>
-  </vm>
-  
-  <vm name="CH2">
-	  <if id="0" net="C2">
-		  <ipv6>2001:200::1/64</ipv6>
-	  </if>
-
-	  <route type="ipv6" gw="2001:200::3">2001:100::/64</route> <!-- forward to RELAY to Cluster1-->
-	  <route type="ipv6" gw="2001:200::2">2001:1::2/128</route> <!-- forward to MR1 to MR2.IF0 -->
-	  <forwarding type="ip"/>
-  </vm>
-
-
-  <!-- Mobile Routers-->
-  <vm name="MR1">
-	  <if id="1" net="C1">
-		  <ipv6>2001:100::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR1.0">
-		  <ipv6>2001:1::1/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:100::1">default</route> <!-- default gateway is CH1.IF0 -->
-	  <forwarding type="ip"/>
-  </vm> 
-  
-  <vm name="MR2">
-	  <if id="1" net="C2">
-		  <ipv6>2001:200::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR2.0">
-		  <ipv6>2001:1::2/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:200::1">default</route> <!-- default gateway is CH2.IF0 -->
-	  <forwarding type="ip"/>
-  </vm>   
-  
-  <!-- Mobile Nodes -->  
-  <vm name="MN1">
-	  <if id="0" net="MN1.0">
-	  </if>
-  </vm>
-
-  <vm name="MN2">
-	  <if id="0" net="MN2.0">
-	  </if>
-  </vm>
-</vnuml>
-
diff --git a/openair3/EMULATIONS/INTER/utils.tcl b/openair3/EMULATIONS/INTER/utils.tcl
deleted file mode 100644
index acac06b9a4..0000000000
--- a/openair3/EMULATIONS/INTER/utils.tcl
+++ /dev/null
@@ -1,371 +0,0 @@
-#
-# Utilities for Proxy Mobile IPv6
-# Author Huu-Nghia.Nguyen@eurecom.fr
-#
-
-#==========================================================================
-proc progress { start end } {
-        global ns
-        set now [$ns now]
-        if {$now <= $end && $now >= $start} {
-                set percent [expr floor(($now-$start)*100/($end-$start))]
-                puts "Progress: $percent%"
-                $ns at [expr $now + 1] "progress $start $end"
-        } else {
-                puts "Progres: 100% Completed!"
-        }
-}
-#==========================================================================
-#Install radvd.conf in to the virtual machine <vmid> = {MN, AR1, AR2, CN, Router}
-#You need to create the file <vmid>_radvd.conf first (Attention: No check for file existence)
-# 
-proc install-radvd vmid {
-	global vms
-	exec cp $vmid\_radvd.conf [$vms($vmid) set opt(uml_dir)]/hostfs/radvd.conf
-	job $vmid cp /mnt/hostfs/radvd.conf /etc/radvd.conf
-}
-#==========================================================================
-proc start-all-pmip6d { options } {
-        job CH1 /mnt/hostfs/pmip6d $options -i -c -L 2001:100::1 -A 2001:200::1
-        job MR1 /mnt/hostfs/pmip6d $options -i -m -s -L 2001:100::1 -E 2001:100::2 -N 2001:1::1
-
-        job CH2 /mnt/hostfs/pmip6d $options -i -c -L 2001:200::1 -A 2001:100::1
-        job MR2 /mnt/hostfs/pmip6d $options -i -m -s -L 2001:200::1 -E 2001:200::2 -N 2001:1::2
-}
-
-#==========================================================================
-proc stop-all-pmip6d {} {
-        job CH1 killall -INT pmip6d
-        job CH2 killall -INT pmip6d
-        job MR1 killall -INT pmip6d
-        job MR2 killall -INT pmip6d
-        job MN1 ifconfig eth0 down
-        job MN2 ifconfig eth0 down
-}
-
-#==========================================================================
-proc config-chorist {} {
-	job RELAY sysctl -w net.ipv6.conf.all.forwarding=1
-	install-radvd MR1
-	install-radvd MR2
-	job MR1 sysctl -w net.ipv6.conf.eth0.proxy_ndp=1
-	job MR2 sysctl -w net.ipv6.conf.eth0.proxy_ndp=1
-        job MR1 service radvd restart
-        job MR2 service radvd restart
-
-	global vms
-	exec cp /usr/bin/telnet [$vms(CH1) set opt(uml_dir)]/hostfs/
-	exec cp /usr/bin/telnet [$vms(CH2) set opt(uml_dir)]/hostfs/
-	exec cp /usr/bin/telnet [$vms(MR1) set opt(uml_dir)]/hostfs/
-	exec cp /usr/bin/telnet [$vms(MR2) set opt(uml_dir)]/hostfs/
-}
-#==========================================================================
-proc progress { start end } {
-	global ns
-	set now [$ns now]
-	if {$now <= $end && $now >= $start} {
-		set percent [expr floor(($now-$start)*100/($end-$start))]
-		puts "Progress: $percent%"
-		$ns at [expr $now + 1] "progress $start $end"
-	} else {
-		puts "Progres: 100% Completed!"
-	}
-}
-#==========================================================================
-proc start-test-ro { options {filename "ro.log"} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:        
-        progress $now [expr $now + 25]
-        setdest_1 150 100 100
-        setdest_2 450 100 100
-        job MN1 ifconfig eth0 down
-        job MN2 ifconfig eth0 down
-
-        #Start pmip6d
-        $ns at [expr $now+5] "start-all-pmip6d $options"
-
-        #MN1 joins the network 
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-        $ns at [expr $now +11] "job MN2 ifconfig eth0 up"
-	$ns at [expr $now+25] "job MN2 ping6 2001:1::fcfd:ff:fe00:600"
-
-
-}
-#==========================================================================
-proc stop-test-ro {} {
-        global ns
-        set now [$ns now]
-
-        progress $now [expr $now + 6]
-        $ns at [expr $now+5] "job MN1 ifconfig eth0 down"
-	$ns at [expr $now+5] "job MN2 ifconfig eth0 down"
-        #Finish
-        $ns at [expr $now+5] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+5] "stop-all-pmip6d"
-	$ns at [expr $now+6] "job MN2 killall -INT ping6"
-}
-#==========================================================================
-proc chorist-mobility { {filename "mobility.log"} } {
-	global ns	
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 200]
-	setdest_1 150 100 100 
-	setdest_2 450 100 100
-	job MN1 ifconfig eth0 down
-	job MN2 ifconfig eth0 down
-
-	#Observation
-	$ns at [expr $now+5] "start-all-pmip6d"
-
-	#MN1 joins the network 
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now +10] "job MN2 ifconfig eth0 up"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+25] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+100] "setdest_1 100 100 100"
-
-	#MN1 power off
-	$ns at [expr $now+175] "job MN1 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+200] "puts \"Finish, stop all processes and services\""
-	#$ns at [expr $now+150] "stop-all-pmip6d"
-	$ns at [expr $now+201] "puts \"chorist-mobility: DONE!\""
-}
-#==========================================================================
-proc chorist-basic { {filename "basic.log"} } {
-	global ns	
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 150]
-	setdest_1 150 100 100 
-	job MN1 ifconfig eth0 down
-
-	#Observation
-	$ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-	#MN1 joins the network & CN start to ping down; MN1 ping up
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now+15] "job CN ping6 2001:1::fcfd:ff:fe00:500"
-	$ns at [expr $now+15] "job MN1 ping6 2000::1"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+25] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+75] "setdest_1 100 100 100"
-
-	#MN1 power off
-	$ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-	$ns at [expr $now+150] "job CN killall -INT ping6"
-	$ns at [expr $now+150] "job MN1 killall -INT ping6"
-	$ns at [expr $now+150] "job CH killall -INT tcpdump"
-	$ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-	$ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-	#$ns at [expr $now+150] "stop-all-pmip6d"
-	$ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
-proc chorist-tcp-basic { {filename "tcp_basic.log"} {copt "-l 4M"} {options ""} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:        
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-        job MN1 ifconfig eth0 down
-	job CN ifconfig eth0 mtu 1300
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CN iperf -V -s $options"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job CN tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & send tcp traffic to CN
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+20] "job MN1 iperf -V -c 2000::1 $copt $options"
-
-        #MN1 is moving to MR2 
-        $ns at [expr $now+45] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 power off
-        $ns at [expr $now+124] "job MN1 killall -INT tcpdump"
-        $ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job CN killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        $ns at [expr $now+150] "job CN killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
-proc chorist-udp-basic { {filename "udp_basic.log"} {copt "-t 100"} {options "-u"} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:        
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-        job MN1 ifconfig eth0 down
-        job CN ifconfig eth0 mtu 1300
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job CN tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & send tcp traffic to CN
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN1 iperf -V -s $options"
-        $ns at [expr $now+20] "job MN1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+25] "job CN iperf -V -c 2001:1::fcfd:ff:fe00:500 $copt $options"
-
-        #MN1 is moving to MR2 
-        $ns at [expr $now+45] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 power off
-        $ns at [expr $now+124] "job MN1 killall -INT tcpdump"
-	$ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job CN killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        $ns at [expr $now+150] "job CN killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-udp-basic: DONE!\""
-}
-
-#==========================================================================
-proc chorist-intra { {filename "intra.log"} } {
-	global ns stdout
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 201]
-	setdest_1 150 100 100 
-	job MN1 ifconfig eth0 down
-	job MN2 ifconfig eth0 down
-
-	#Observation
-	set stdout "/mnt/hostfs/pmip6d.log"
-	$ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-	set stdout "/dev/null"
-	#MN1 & MN2 joins the network 
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now+10] "job MN2 ifconfig eth0 up"
-
-	#MN1 & MN2 ping each other 
-	set stdout "/mnt/hostfs/ping6.log"
-	$ns at [expr $now+20] "job MN2 ping6 2001:1::fcfd:ff:fe00:500"
-	$ns at [expr $now+20] "job MN1 ping6 2001:1::fcfd:ff:fe00:600"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+35] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+100] "setdest_1 100 100 100"
-
-	#MN1 & MN2 power off
-	set stdout "/dev/null"
-	$ns at [expr $now+175] "job MN1 ifconfig eth0 down"
-	$ns at [expr $now+175] "job MN2 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+200] "puts \"Finish, stop all processes and services\""
-	$ns at [expr $now+200] "job MN2 killall -INT ping6"
-	$ns at [expr $now+200] "job MN1 killall -INT ping6"
-	$ns at [expr $now+200] "job CH killall -INT tcpdump"
-	$ns at [expr $now+200] "job MR1 killall -INT tcpdump"
-	$ns at [expr $now+200] "job MR2 killall -INT tcpdump"
-	#$ns at [expr $now+200] "stop-all-pmip6d"
-	$ns at [expr $now+200] "puts \"chorist-intra: DONE!\""
-
-	set stdout "/mnt/hostfs/stdout"
-}
-
-
-proc chorist-tcp-intra { {filename "tcp_intra.log"} {copt "-l 4M"} {options ""} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-	setdest_2 450 100 100
-        job MN1 ifconfig eth0 down
-        job MN2 ifconfig eth0 down
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & CN start to ping down; MN1 ping up
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+10] "job MN2 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN2 iperf -V -s $options"
-        $ns at [expr $now+20] "job MN2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+25] "job MN1 iperf -V -c 2001:1::fcfd:ff:fe00:600 $copt $options"
-
-        #MN1 is moving to MR2
-        $ns at [expr $now+35] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 MN2 power off
-        $ns at [expr $now+124] "job MN2 killall -INT tcpdump"
-        $ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-        $ns at [expr $now+125] "job MN2 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job MN2 killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
diff --git a/openair3/EMULATIONS/INTER/vninteractive.tcl b/openair3/EMULATIONS/INTER/vninteractive.tcl
deleted file mode 100644
index d4a56b94b9..0000000000
--- a/openair3/EMULATIONS/INTER/vninteractive.tcl
+++ /dev/null
@@ -1,66 +0,0 @@
-#http://wiki.tcl.tk/1968
-#from Jeffrey Hobbs
-
- puts -nonewline "vnman (0) % "
- if {!$tcl_interactive} {
-     set long_command ""
-     set verbose_history 0
-     if {![catch {rename unknown tcl_unknown}]} {
- 	proc unknown {cmdname args} {
- 	    if {[regexp "^!..*" $cmdname]} {
- 		banghist [string range $cmdname 1 end]
- 	    } else {
- 		tcl_unknown $cmdname $args
- 	    }
- 	}
-     }
-
-     proc banghist {val} {
- 	global verbose_history
- 	if {![string compare $val "!"]} {set val ""}
- 	if {$verbose_history} {puts "[history event $val]"}
- 	history redo $val
-     }
-
-     if {![info exists tcl_prompt1]} {
- 	set tcl_prompt1 {puts -nonewline "vnman ([history nextid]) % "}
-     }
-     proc read_stdin {} {
- 	global eventLoop tcl_prompt1 long_command
- 	set l [gets stdin]
- 	if {[eof stdin]} {
- 	    set eventLoop "done"     ;# terminate the vwait eventloop
- 	} else {
- 	    if {[string compare $l {}]} {
- 		append long_command "\n$l"
- 		set l $long_command
- 		if {[info complete $l]} {
- 		    if {[catch {uplevel \#0 history add [list $l] exec} err]} {
- 			puts stderr $err
- 		    } elseif {[string compare $err {}]} {
- 			puts $err
- 		    }
- 		    set long_command ""
- 		    catch $tcl_prompt1
- 		} else {
- 		    puts -nonewline "> "
- 		}
- 	    } elseif {![string compare $long_command {}]} {
- 		catch $tcl_prompt1
- 	    } else {
- 		puts -nonewline "> "
- 	    }
- 	    flush stdout
- 	}
-     }
-
-     # set up our keyboard read event handler:
-     # Vector stdin data to the socket
-     fileevent stdin readable read_stdin
-
-     catch $tcl_prompt1
-     flush stdout
-     # wait for and handle or stdin events...
-     #vwait eventLoop
- }
-
diff --git a/openair3/EMULATIONS/INTER/vnmanager.tcl b/openair3/EMULATIONS/INTER/vnmanager.tcl
deleted file mode 100644
index 4784191fd3..0000000000
--- a/openair3/EMULATIONS/INTER/vnmanager.tcl
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# Management Script for Virtual Networking User-Mode-Linux
-# Author: Huu-Nghia Nguyen
-# Email: Huu-Nghia.Nguyen@eurecom.fr
-# Eurecom Institute
-#
-
-Class VirtualMachine
-proc flatten list {return [string map {\{ "" \} ""} $list]}
-
-VirtualMachine instproc init {vm_opt_list} {
-        $self instvar opt sname
-	array set sname {}
-	array set opt $vm_opt_list
-	set dir [split $opt(uml_dir) "/"]
-	set len [llength $dir]
-        set opt(vmid) [lindex $dir [expr $len-2]]
-        set opt(scenario) [lindex $dir [expr $len-4]]
-        puts "VM ($opt(scenario).$opt(vmid)) running in $opt(uml_dir) is created"
-}
-
-VirtualMachine instproc mconsole args {
-	$self instvar opt
-	set dir $opt(uml_dir)$opt(umid)
-	set cmdline "cd $dir && uml_mconsole mconsole [flatten $args]"
-	puts "execute the command: $cmdline"
-	set result [exec sh -c "cd $dir && uml_mconsole mconsole [flatten $args]" 2>/dev/null]
-	return $result
-}
-
-VirtualMachine instproc getinfo {param idx} {
-	$self instvar opt
-	return [lindex [split $opt($param) ","] $idx]
-}
-
-########################################################################
-#								       	
-#                    PARSE THE ENVIRONMENT                             
-#								       
-########################################################################
-set vm_cmds [exec  ps -ef | grep linux | sed s/.*linux//g | sort | uniq ]
-
-## Split into vm_cmd_lines
-set vm_cmd_lines [split $vm_cmds "\n"]
-array unset vms
-set stdout "/mnt/hostfs/stdout"
-set stderr "/mnt/hostfs/stdout"
-set filestdout ""
-
-## Iterate over the vm_cmd_lines
-foreach cmd  $vm_cmd_lines {
-	#puts "---------\nAnalyse the command line:"
-	#puts $cmd
-	set params [split $cmd " "]
-	array unset opt
-	foreach param  $params {
-		set fields [split $param "="]
-		set optname [lindex $fields 0]
-		set optval [lindex $fields 1] 
-		if {$optval != ""} {
-			set opt($optname) $optval
-		}
-	}
-
-	if {[array size opt] > 0} {
-		set vm [new VirtualMachine [array get opt]]
-		set vms([$vm set opt(vmid)]) $vm		
-	}
-}
-
-########################################################################
-#								       	
-#                    COMMAND IMPLEMENTATION                               
-#								       
-########################################################################
-
-set helpstr "Command list:\n\
-		\tconfig <vm> <device\[=options\]>: querry/add a new device to <vm>\n\
-		\tjob <vm> <command>: execute a command in <vm> using sh -c\n\
-		\tresult <vm>: return result of last job\n\
-		\tterm  <vm> <conid>: open the console <conid> of <vm>\n\
-		\tmconsole <vm> <args>: run uml_mconsole for <vm>\n\
-		\tsetdest <x> <y> <speed>: \n\t\tset destination (<x>, <y>) for the MN with the speed of <speed> m/s\n"
-proc help {} {
-	global helpstr
-	puts $helpstr
-}
-
-
-proc config {vmid args} {
-	global vms
-	set vm $vms($vmid)
-	return [$vm mconsole config $args]
-}
-
-proc job {vmid args} {
-	global vms filestdout
-	global stdout stderr
-	set vm $vms($vmid)
-	catch { exec rm opt(uml_dir)]/hostfs/$stdout }
-	return [$vm mconsole exec "'" $args ">$stdout 2>$stderr '"]
-        regsub {(.*)/(.*)} $stdout {\2} filename
-        set filestdout [$vm set opt(uml_dir)]/hostfs/$filename
-        exec cat $filestdout
-
-}
-
-proc lastresult {} {
-	exec cat $filestdout
-}
-
-proc result {vmid} {
-        global vms
-        global stdout stderr
-        set vm $vms($vmid)
-	regsub {(.*)/(.*)} $stdout {\2} filename
-	set filestdout [$vm set opt(uml_dir)]/hostfs/$filename
-        exec cat $filestdout 
-}
-
-proc term {vmid conid} {
-	global vms
-	set vm $vms($vmid)
-	
-	#Create screen name 
-	set result [$vm mconsole config $conid]
-	regsub {(.*):(.*)} $result {\2} device
-	regsub {(.*)/(\d+)} $device {\2} devid
-	set screenname "$conid$devid$vmid"
-
-	#Try to look up in the env if the screen exist?
-	set filename /tmp/vnman-screen-[pid].cfg
-	catch {	exec screen -ls > $filename } {}
-	set output [split [exec cat $filename] "\n"]
-	if {[lsearch -regex $output ".*$screenname.*"] < 0} {exec screen -d -m -S $screenname $device}
-	catch { exec rm -f $filename}
-
-	#Show the terminal
-	exec konsole -e screen -d -r $screenname &
-	
-}
-
-proc mconsole {vmid args} {
-	global vms
-	set vm $vms($vmid)
-	return [$vm mconsole $args]
-} 
-########################################################################
-#								       	
-#                    COMMAND LINE INTERFACE                              
-#								       
-########################################################################
-
-puts "VM lists: [array names vms]"
-help
-source vninteractive.tcl
-source wirelesstopo.tcl
-stop
-
-
-
diff --git a/openair3/EMULATIONS/INTER/wirelesstopo.tcl b/openair3/EMULATIONS/INTER/wirelesstopo.tcl
deleted file mode 100644
index 5b1b87e665..0000000000
--- a/openair3/EMULATIONS/INTER/wirelesstopo.tcl
+++ /dev/null
@@ -1,171 +0,0 @@
-#! /bin/nse
-
-# An example script for the usage of ns-2 in emulation mode:
-# Uses:
-# 1. Network/Daemon agents (by Huu-Nghia.Nguyen@eurecom.fr) to access to a uml_switch at level II 
-# 2. Tap/Raw agents to map between real MAC addresses and NS-2 IP addresses
-# 3. In-memory compression of the trace file to reduce disk write operations during simulation
-#	(currently done via gzip)
-
-
-# Common variables
-# 
-
-set scriptname		/tmp/chorist_inter.tr
-set val(chan)           Channel/WirelessChannel    ;# Channel Type
-set val(prop)           Propagation/TwoRayGround   ;# radio-propagation model
-set val(netif)          Phy/WirelessPhy            ;# network interface type
-set val(mac)            Mac/802_11                 ;# MAC type
-set val(ifq)            Queue/DropTail/PriQueue    ;# interface queue type
-set val(ll)             LL                         ;# link layer type
-set val(ant)            Antenna/OmniAntenna        ;# antenna model
-set val(ifqlen)         50                         ;# max packet in ifq
-set val(x)              800			   ;# x range in meters
-set val(y)              600			   ;# y range in meters
-set val(rp)		DumbAgent		   ;# routing protocol
-set val(nn)		4			   ;# number of mobile nodes
-#set val(stime)		200.0			   ;# simulation time
-set val(stime)		360000.0		   ;# simulation time = 100 hours
-
-set ns	[new Simulator]
-$ns use-scheduler RealTime
-
-set tracefd  [open $scriptname w]
-$ns trace-all $tracefd
-
-#set namtrace [open $scriptname.nam w]
-#set namtrace [open "|nam -r 0.1 -" w]
-#$ns namtrace-all-wireless $namtrace $val(x) $val(y)
-
-#Procedure needed when running nam in real-time
-proc NamTime {} {
-	#Send time to nam periodically
-	global ns namtrace
-	set now [$ns now]
-	set next [expr $now + 0.05]
-	puts $namtrace "T -t $now"
-	flush $namtrace
-	$ns at $next "NamTime"
-}
-
-#$ns at 1.0 "NamTime"
-
-proc UniformErr {} {
-    set err [new ErrorModel]
-    $err unit packet
-    $err set rate_ 0.01
-    $err ranvar [new RandomVariable/Uniform]
-    $err drop-target [new Agent/Null]
-    return $err
-}
-
-set topo [new Topography]
-
-$topo load_flatgrid $val(x) $val(y)
-
-# Create GOD
-create-god $val(nn)
-
-# Create channel
-set chan_1 [new $val(chan)]
-set chan_2 [new $val(chan)]
-
-# Configure node parameters
-$ns node-config -adhocRouting $val(rp) \
-	-llType $val(ll) \
-	-macType $val(mac) \
-	-ifqType $val(ifq) \
-	-ifqLen $val(ifqlen) \
-	-antType $val(ant) \
-	-propType $val(prop) \
-	-phyType $val(netif) \
-	-topoInstance $topo \
-	-agentTrace ON \
-	-routerTrace ON \
-	-macTrace ON \
-	-movementTrace ON \
-	-channel $chan_1 \
-	-IncomingErrProc UniformErr
-
-#Procedure to configure an ns-2 node initially
-proc setup_node {id x y z color} {
-	global ns node_
-	set node_($id) [$ns node]
-	$node_($id) set X_ $x
-	$node_($id) set Y_ $y
-	$node_($id) set Z_ $z
-	$node_($id) color $color
-	$ns at 0 "$node_($id) setdest $x $y 0"
-	$ns at 0 "$node_($id) color $color"
-	$node_($id) random-motion 0
-}
-			
-#Topo table:
-set RELAY $vms(RELAY)
-set CH1 $vms(CH1)
-set CH2 $vms(CH2)
-set MR1 $vms(MR1)
-set MR2 $vms(MR2)
-set MN1 $vms(MN1)
-set MN2 $vms(MN2)
-
-set map(1) [list $MR1 eth0 $chan_2 100 100 0 "green"]
-set map(2) [list $MR2 eth0 $chan_2 500 100 0 "green"]
-set map(3) [list $MN1 eth0 $chan_2 150 100 0 "red"]
-set map(4) [list $MN2 eth0 $chan_2 450 100 0 "red"]
-	
-Agent/Tap set maxpkt_ 1500
-for {set i 1} {$i <= $val(nn)} {incr i} {
-	$ns node-config -channel [lindex $map($i) 2]
-	puts  "setup_node $i [lindex $map($i) 3]  [lindex $map($i) 4]  [lindex $map($i) 5]  [lindex $map($i) 6]"
-	setup_node $i [lindex $map($i) 3]  [lindex $map($i) 4]  [lindex $map($i) 5]  [lindex $map($i) 6]
-
-	$ns at 0 "$node_($i) start";
-    	$ns at $val(stime) "$node_($i) reset";
-
-	#set raw($i) [new Network/Raw]
-	set raw($i) [new Network/Daemon]
-	set node [lindex $map($i) 0]
-	set iff [lindex $map($i) 1]
-	puts  [$node getinfo $iff 1]
-	#$raw($i) open [$node getinfo $iff 1] readwrite
-	$raw($i) open [$node getinfo $iff 3] readwrite
-	
-	#Tap Agent for each node
-	puts  [$node getinfo $iff 2]
-	#set tagent($i) [new Agent/Tap/Raw [$node getinfo $iff 2]]
-#	if {$node == $MR2 && $iff == "eth0"} {
-#		set tagent($i) [new Agent/Tap/Raw fe:fd:0:0:3:0]
-#	} else { 
-		set tagent($i) [new Agent/Tap/Raw [$node getinfo $iff 1]]
-#	}
-	$tagent($i) network $raw($i)
-	$ns attach-agent $node_($i) $tagent($i)
-}
-
-$ns at $val(stime) "stop"
-$ns at $val(stime) "puts \"NS EXITING ...\" ; $ns halt"
-
-proc setdest_1 { x y speed} {
-	global node_
-	$node_(3) setdest $x $y $speed
-}
-proc setdest_2 { x y speed} {
-	global node_
-	$node_(4) setdest $x $y $speed
-}
-
-proc stop {} {
-	global ns tracefd raw 
-	$ns flush-trace
-	close $tracefd
-	for {set i 1} {$i <= $val(nn)} {incr i} {
-		$raw($i) close
-	}
-}
-	
-
-source utils.tcl    
-puts "okey"
-	
-$ns run
diff --git a/openair3/EMULATIONS/INTRA/MR1_radvd.conf b/openair3/EMULATIONS/INTRA/MR1_radvd.conf
deleted file mode 100644
index f634a45624..0000000000
--- a/openair3/EMULATIONS/INTRA/MR1_radvd.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-    # cat /etc/radvd.conf
-    interface eth0
-    {
-          AdvSendAdvert on;
-          AdvIntervalOpt on;
-          AdvHomeAgentFlag on;
-
-          MinRtrAdvInterval 0.1;
-          MaxRtrAdvInterval 0.3;
-
-	  AdvReachableTime 1;
-	  AdvRetransTimer 1;
-
-          prefix 2001:1::1/64
-          {
-              AdvOnLink on;
-	      AdvValidLifetime 20;
-	      AdvPreferredLifetime 15;
-
-              AdvAutonomous on;
-              AdvRouterAddr on;
-          };
-
-          prefix fec0:1000::1/64
-          {
-              AdvOnLink on;
-             AdvAutonomous on;
-            AdvRouterAddr on;
-
-	      AdvValidLifetime 5;
-	      AdvPreferredLifetime 1;
-         };
-   };
-
diff --git a/openair3/EMULATIONS/INTRA/MR2_radvd.conf b/openair3/EMULATIONS/INTRA/MR2_radvd.conf
deleted file mode 100644
index 2454796c77..0000000000
--- a/openair3/EMULATIONS/INTRA/MR2_radvd.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-    # cat /etc/radvd.conf
-    interface eth0
-    {
-          AdvSendAdvert on;
-          AdvIntervalOpt on;
-          AdvHomeAgentFlag on;
-
-          MinRtrAdvInterval 0.1;
-          MaxRtrAdvInterval 0.3;
-
-	  AdvReachableTime 1;
-	  AdvRetransTimer 1;
-
-          prefix 2001:1::1/64
-          {
-              AdvValidLifetime 20;
-              AdvPreferredLifetime 15;
-    
-	      AdvOnLink on;
-              AdvAutonomous on;
-              AdvRouterAddr on;
-          };
-
-          prefix fec0:2000::1/64
-          {
-              AdvOnLink on;
-              AdvAutonomous on;
-              AdvRouterAddr on;
-
-	      AdvValidLifetime 10;
-	      AdvPreferredLifetime 1;
-          };
-    };
-
diff --git a/openair3/EMULATIONS/INTRA/chorist.xml b/openair3/EMULATIONS/INTRA/chorist.xml
deleted file mode 100644
index a530fbd975..0000000000
--- a/openair3/EMULATIONS/INTRA/chorist.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--DOCTYPE vnuml SYSTEM "/usr/local/share/xml/vnuml/vnuml.dtd"--> 
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-This file describe the Wireless Mesh Network topology for Chorist Project
-Author: 
-	Huu-Nghia.Nguyen@eurecom.fr
-	Christian.Bonnet@eurecom.fr
--->
-
-<vnuml>
-  <global>
-    <version>1.8</version>
-    <simulation_name>chorist</simulation_name>
-    <automac/>
-    <vm_mgmt type="none" />
-    <vm_defaults exec_mode="mconsole">
-  		<filesystem type="cow">/home/Local_Data/nguyenhn/airnet/root_fs.fc6</filesystem>
-	<kernel>/home/Local_Data/nguyenhn/airnet/linux</kernel>
-<!--
-	    <filesystem type="cow">/home/all/root_fs.fc6</filesystem>
-	    <kernel>/home/all/linux</kernel>
--->	
-
-       <console id="0">xterm</console>
-       <console id="1">pts</console>
-       <console id="2">pts</console>
-       <console id="3">pts</console>
-       <console id="4">pts</console>
-       <console id="5">pts</console>
-    </vm_defaults>
-  </global>
-
-  <net name="Inter" mode="uml_switch" hub="yes" />
-  <net name="CH.0" mode="uml_switch" hub="yes"/>
-  <net name="MR1.1" mode="uml_switch" hub="yes" />
-  <net name="MR2.1" mode="uml_switch" hub="yes" />
-  <net name="MR1.0" mode="uml_switch" hub="yes" />
-  <net name="MR2.0" mode="uml_switch" hub="yes" />
-  <net name="MN1.0" mode="uml_switch" hub="yes" />
-  <net name="MN2.0" mode="uml_switch" hub="yes" />
-
-  <!-- Correspondent Node -->  
-
-  <vm name="CN">
-	  <if id="0" net="Inter">
-		  <ipv6>2000::1/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2000::2">2001::/16</route>
-  </vm>
-  
-  <!-- Cluster Heads -->
-  <vm name="CH">
-	  <if id="1" net="Inter">
-		  <ipv6>2000::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="CH.0">
-		  <ipv6>2001:100::1/64</ipv6>
-	  </if>
-
-	  <route type="ipv6" gw="2001:100::2">2001:1::1/128</route> <!-- forward to MR1 -->
-	  <route type="ipv6" gw="2001:100::3">2001:1::2/128</route> <!-- forward to MR2 -->
-	  <route type="ipv6" gw="2000::2">2000::/16</route> <!-- forward through CH.1-->
-
-	  <forwarding type="ip"/>
-  </vm>
-  
-  <!-- Mobile Routers-->
-  <vm name="MR1">
-	  <if id="1" net="MR1.1">
-		  <ipv6>2001:100::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR1.0">
-		  <ipv6>2001:1::1/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:100::1">default</route> <!-- default gateway is CH.IF0 -->
-	  <forwarding type="ip"/>
-  </vm> 
-  
-  <vm name="MR2">
-	  <if id="1" net="MR2.1">
-		  <ipv6>2001:100::3/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR2.0">
-		  <ipv6>2001:1::2/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:100::1">default</route> <!-- default gateway is CH.IF0 -->
-	  <forwarding type="ip"/>
-  </vm>   
-  
-  <!-- Mobile Nodes -->  
-  <vm name="MN1">
-	  <if id="0" net="MN1.0">
-	  </if>
-  </vm>
-
-  <vm name="MN2">
-	  <if id="0" net="MN2.0">
-	  </if>
-  </vm>
-</vnuml>
-
diff --git a/openair3/EMULATIONS/INTRA/chorist_intra.xml b/openair3/EMULATIONS/INTRA/chorist_intra.xml
deleted file mode 100644
index 64e899f58a..0000000000
--- a/openair3/EMULATIONS/INTRA/chorist_intra.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--DOCTYPE vnuml SYSTEM "/usr/local/share/xml/vnuml/vnuml.dtd"--> 
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-<!--
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE vnuml SYSTEM "/packages/vnuml_1.8.3/share/xml/vnuml/vnuml.dtd">
-
-This file describe the Wireless Mesh Network topology for Chorist Project
-Author: 
-	Huu-Nghia.Nguyen@eurecom.fr
-	Christian.Bonnet@eurecom.fr
--->
-
-<vnuml>
-  <global>
-    <version>1.8</version>
-    <simulation_name>chorist_intra</simulation_name>
-    <automac/>
-    <vm_mgmt type="none" />
-    <vm_defaults exec_mode="mconsole">
-  		<filesystem type="cow">/home/Local_Data/nguyenhn/airnet/root_fs.fc6</filesystem>
-	<kernel>/home/Local_Data/nguyenhn/airnet/linux</kernel>
-<!--
-	    <filesystem type="cow">/home/all/root_fs.fc6</filesystem>
-	    <kernel>/home/all/linux</kernel>
--->	
-
-       <console id="0">xterm</console>
-       <console id="1">pts</console>
-       <console id="2">pts</console>
-       <console id="3">pts</console>
-       <console id="4">pts</console>
-       <console id="5">pts</console>
-    </vm_defaults>
-  </global>
-
-  <net name="Inter" mode="uml_switch" hub="yes" />
-  <net name="CH.0" mode="uml_switch" hub="yes"/>
-  <net name="MR1.1" mode="uml_switch" hub="yes" />
-  <net name="MR2.1" mode="uml_switch" hub="yes" />
-  <net name="MR1.0" mode="uml_switch" hub="yes" />
-  <net name="MR2.0" mode="uml_switch" hub="yes" />
-  <net name="MN1.0" mode="uml_switch" hub="yes" />
-  <net name="MN2.0" mode="uml_switch" hub="yes" />
-
-  <!-- Correspondent Node -->  
-
-  <vm name="CN">
-	  <if id="0" net="Inter">
-		  <ipv6>2000::1/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2000::2">2001::/16</route>
-  </vm>
-  
-  <!-- Cluster Heads -->
-  <vm name="CH">
-	  <if id="1" net="Inter">
-		  <ipv6>2000::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="CH.0">
-		  <ipv6>2001:100::1/64</ipv6>
-	  </if>
-
-	  <route type="ipv6" gw="2001:100::2">2001:1::1/128</route> <!-- forward to MR1 -->
-	  <route type="ipv6" gw="2001:100::3">2001:1::2/128</route> <!-- forward to MR2 -->
-	  <route type="ipv6" gw="2000::2">2000::/16</route> <!-- forward through CH.1-->
-
-	  <forwarding type="ip"/>
-  </vm>
-  
-  <!-- Mobile Routers-->
-  <vm name="MR1">
-	  <if id="1" net="MR1.1">
-		  <ipv6>2001:100::2/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR1.0">
-		  <ipv6>2001:1::1/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:100::1">default</route> <!-- default gateway is CH.IF0 -->
-	  <forwarding type="ip"/>
-  </vm> 
-  
-  <vm name="MR2">
-	  <if id="1" net="MR2.1">
-		  <ipv6>2001:100::3/64</ipv6>
-	  </if>  
-	  <if id="0" net="MR2.0">
-		  <ipv6>2001:1::2/64</ipv6>
-	  </if>
-	  <route type="ipv6" gw="2001:100::1">default</route> <!-- default gateway is CH.IF0 -->
-	  <forwarding type="ip"/>
-  </vm>   
-  
-  <!-- Mobile Nodes -->  
-  <vm name="MN1">
-	  <if id="0" net="MN1.0">
-	  </if>
-  </vm>
-
-  <vm name="MN2">
-	  <if id="0" net="MN2.0">
-	  </if>
-  </vm>
-</vnuml>
-
diff --git a/openair3/EMULATIONS/INTRA/utils.tcl b/openair3/EMULATIONS/INTRA/utils.tcl
deleted file mode 100644
index b7c0a7b47a..0000000000
--- a/openair3/EMULATIONS/INTRA/utils.tcl
+++ /dev/null
@@ -1,326 +0,0 @@
-#
-# Utilities for Proxy Mobile IPv6
-# Author Huu-Nghia.Nguyen@eurecom.fr
-#
-
-#==========================================================================
-proc progress { start end } {
-        global ns
-        set now [$ns now]
-        if {$now <= $end && $now >= $start} {
-                set percent [expr floor(($now-$start)*100/($end-$start))]
-                puts "Progress: $percent%"
-                $ns at [expr $now + 1] "progress $start $end"
-        } else {
-                puts "Progres: 100% Completed!"
-        }
-}
-#==========================================================================
-#Install radvd.conf in to the virtual machine <vmid> = {MN, AR1, AR2, CN, Router}
-#You need to create the file <vmid>_radvd.conf first (Attention: No check for file existence)
-# 
-proc install-radvd vmid {
-	global vms
-	exec cp $vmid\_radvd.conf [$vms($vmid) set opt(uml_dir)]/hostfs/radvd.conf
-	job $vmid cp /mnt/hostfs/radvd.conf /etc/radvd.conf
-}
-#==========================================================================
-proc start-all-pmip6d {} {
-        job CH /mnt/hostfs/pmip6d -c -L 2001:100::1
-        job MR1 /mnt/hostfs/pmip6d -m -s -L 2001:100::1 -E 2001:100::2 -N 2001:1::1
-        job MR2 /mnt/hostfs/pmip6d -m -s -L 2001:100::1 -E 2001:100::3 -N 2001:1::2
-
-}
-#==========================================================================
-proc stop-all-pmip6d {} {
-        job CH killall -INT pmip6d
-        job MR1 killall -INT pmip6d
-        job MR2 killall -INT pmip6d
-        job MN1 ifconfig eth0 down
-        job MN2 ifconfig eth0 down
-}
-
-#==========================================================================
-proc config-chorist {} {
-	install-radvd MR1
-	install-radvd MR2
-	job MR1 sysctl -w net.ipv6.conf.eth0.proxy_ndp=1
-	job MR2 sysctl -w net.ipv6.conf.eth0.proxy_ndp=1
-        job MR1 service radvd restart
-        job MR2 service radvd restart
-}
-#==========================================================================
-proc progress { start end } {
-	global ns
-	set now [$ns now]
-	if {$now <= $end && $now >= $start} {
-		set percent [expr floor(($now-$start)*100/($end-$start))]
-		puts "Progress: $percent%"
-		$ns at [expr $now + 1] "progress $start $end"
-	} else {
-		puts "Progres: 100% Completed!"
-	}
-}
-#==========================================================================
-proc chorist-mobility { {filename "mobility.log"} } {
-	global ns	
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 200]
-	setdest_1 150 100 100 
-	setdest_2 450 100 100
-	job MN1 ifconfig eth0 down
-	job MN2 ifconfig eth0 down
-
-	#Observation
-	$ns at [expr $now+5] "start-all-pmip6d"
-
-	#MN1 joins the network 
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now +10] "job MN2 ifconfig eth0 up"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+25] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+100] "setdest_1 100 100 100"
-
-	#MN1 power off
-	$ns at [expr $now+175] "job MN1 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+200] "puts \"Finish, stop all processes and services\""
-	#$ns at [expr $now+150] "stop-all-pmip6d"
-	$ns at [expr $now+201] "puts \"chorist-mobility: DONE!\""
-}
-#==========================================================================
-proc chorist-basic { {filename "basic.log"} } {
-	global ns	
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 150]
-	setdest_1 150 100 100 
-	job MN1 ifconfig eth0 down
-
-	#Observation
-	$ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-	#MN1 joins the network & CN start to ping down; MN1 ping up
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now+15] "job CN ping6 2001:1::fcfd:ff:fe00:500"
-	$ns at [expr $now+15] "job MN1 ping6 2000::1"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+25] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+75] "setdest_1 100 100 100"
-
-	#MN1 power off
-	$ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-	$ns at [expr $now+150] "job CN killall -INT ping6"
-	$ns at [expr $now+150] "job MN1 killall -INT ping6"
-	$ns at [expr $now+150] "job CH killall -INT tcpdump"
-	$ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-	$ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-	#$ns at [expr $now+150] "stop-all-pmip6d"
-	$ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
-proc chorist-tcp-basic { {filename "tcp_basic.log"} {copt "-l 4M"} {options ""} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:        
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-        job MN1 ifconfig eth0 down
-	job CN ifconfig eth0 mtu 1300
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CN iperf -V -s $options"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job CN tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & send tcp traffic to CN
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+20] "job MN1 iperf -V -c 2000::1 $copt $options"
-
-        #MN1 is moving to MR2 
-        $ns at [expr $now+45] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 power off
-        $ns at [expr $now+124] "job MN1 killall -INT tcpdump"
-        $ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job CN killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        $ns at [expr $now+150] "job CN killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
-proc chorist-udp-basic { {filename "udp_basic.log"} {copt "-t 100"} {options "-u"} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:        
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-        job MN1 ifconfig eth0 down
-        job CN ifconfig eth0 mtu 1300
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job CN tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & send tcp traffic to CN
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN1 iperf -V -s $options"
-        $ns at [expr $now+20] "job MN1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+25] "job CN iperf -V -c 2001:1::fcfd:ff:fe00:500 $copt $options"
-
-        #MN1 is moving to MR2 
-        $ns at [expr $now+45] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 power off
-        $ns at [expr $now+124] "job MN1 killall -INT tcpdump"
-	$ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job CN killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        $ns at [expr $now+150] "job CN killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-udp-basic: DONE!\""
-}
-
-#==========================================================================
-proc chorist-intra { {filename "intra.log"} } {
-	global ns stdout
-	set now [$ns now]
-
-	#Step 1:	
-	progress $now [expr $now + 201]
-	setdest_1 150 100 100 
-	job MN1 ifconfig eth0 down
-	job MN2 ifconfig eth0 down
-
-	#Observation
-	set stdout "/mnt/hostfs/pmip6d.log"
-	$ns at [expr $now+5] "start-all-pmip6d"
-	$ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
- 	$ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-	set stdout "/dev/null"
-	#MN1 & MN2 joins the network 
-	$ns at [expr $now+10] "job MN1 ifconfig eth0 up"
-	$ns at [expr $now+10] "job MN2 ifconfig eth0 up"
-
-	#MN1 & MN2 ping each other 
-	set stdout "/mnt/hostfs/ping6.log"
-	$ns at [expr $now+20] "job MN2 ping6 2001:1::fcfd:ff:fe00:500"
-	$ns at [expr $now+20] "job MN1 ping6 2001:1::fcfd:ff:fe00:600"
-
-	#MN1 is moving to MR2 
-	$ns at [expr $now+35] "setdest_1 450 100 100"
-
-	#MN1 is moving back MR1
-	$ns at [expr $now+100] "setdest_1 100 100 100"
-
-	#MN1 & MN2 power off
-	set stdout "/dev/null"
-	$ns at [expr $now+175] "job MN1 ifconfig eth0 down"
-	$ns at [expr $now+175] "job MN2 ifconfig eth0 down"
-
-	#Finish
-	$ns at [expr $now+200] "puts \"Finish, stop all processes and services\""
-	$ns at [expr $now+200] "job MN2 killall -INT ping6"
-	$ns at [expr $now+200] "job MN1 killall -INT ping6"
-	$ns at [expr $now+200] "job CH killall -INT tcpdump"
-	$ns at [expr $now+200] "job MR1 killall -INT tcpdump"
-	$ns at [expr $now+200] "job MR2 killall -INT tcpdump"
-	#$ns at [expr $now+200] "stop-all-pmip6d"
-	$ns at [expr $now+200] "puts \"chorist-intra: DONE!\""
-
-	set stdout "/mnt/hostfs/stdout"
-}
-
-
-proc chorist-tcp-intra { {filename "tcp_intra.log"} {copt "-l 4M"} {options ""} } {
-        global ns
-        set now [$ns now]
-
-        #Step 1:
-        progress $now [expr $now + 150]
-        setdest_1 150 100 100
-	setdest_2 450 100 100
-        job MN1 ifconfig eth0 down
-        job MN2 ifconfig eth0 down
-
-        #Observation
-        $ns at [expr $now+5] "start-all-pmip6d"
-        $ns at [expr $now+5] "job CH tcpdump -s 256 -i eth1 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR1 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+5] "job MR2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-
-        #MN1 joins the network & CN start to ping down; MN1 ping up
-        $ns at [expr $now+10] "job MN1 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+10] "job MN2 ifconfig eth0 up mtu 1300"
-        $ns at [expr $now+20] "job MN2 iperf -V -s $options"
-        $ns at [expr $now+20] "job MN2 tcpdump -s 256 -i eth0 -v -w /mnt/hostfs/$filename "
-        $ns at [expr $now+25] "job MN1 iperf -V -c 2001:1::fcfd:ff:fe00:600 $copt $options"
-
-        #MN1 is moving to MR2
-        $ns at [expr $now+35] "setdest_1 450 100 100"
-
-        #MN1 is moving back MR1
-        $ns at [expr $now+75] "setdest_1 100 100 100"
-
-        #MN1 MN2 power off
-        $ns at [expr $now+124] "job MN2 killall -INT tcpdump"
-        $ns at [expr $now+125] "job MN1 ifconfig eth0 down"
-        $ns at [expr $now+125] "job MN2 ifconfig eth0 down"
-
-        #Finish
-        $ns at [expr $now+150] "puts \"Finish, stop all processes and services\""
-        $ns at [expr $now+150] "job MN2 killall -INT iperf"
-        $ns at [expr $now+149] "job MN1 killall -INT iperf"
-        $ns at [expr $now+150] "job CH killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR1 killall -INT tcpdump"
-        $ns at [expr $now+150] "job MR2 killall -INT tcpdump"
-        #$ns at [expr $now+150] "stop-all-pmip6d"
-        $ns at [expr $now+151] "puts \"chorist-basic: DONE!\""
-}
-
diff --git a/openair3/EMULATIONS/INTRA/vninteractive.tcl b/openair3/EMULATIONS/INTRA/vninteractive.tcl
deleted file mode 100644
index d4a56b94b9..0000000000
--- a/openair3/EMULATIONS/INTRA/vninteractive.tcl
+++ /dev/null
@@ -1,66 +0,0 @@
-#http://wiki.tcl.tk/1968
-#from Jeffrey Hobbs
-
- puts -nonewline "vnman (0) % "
- if {!$tcl_interactive} {
-     set long_command ""
-     set verbose_history 0
-     if {![catch {rename unknown tcl_unknown}]} {
- 	proc unknown {cmdname args} {
- 	    if {[regexp "^!..*" $cmdname]} {
- 		banghist [string range $cmdname 1 end]
- 	    } else {
- 		tcl_unknown $cmdname $args
- 	    }
- 	}
-     }
-
-     proc banghist {val} {
- 	global verbose_history
- 	if {![string compare $val "!"]} {set val ""}
- 	if {$verbose_history} {puts "[history event $val]"}
- 	history redo $val
-     }
-
-     if {![info exists tcl_prompt1]} {
- 	set tcl_prompt1 {puts -nonewline "vnman ([history nextid]) % "}
-     }
-     proc read_stdin {} {
- 	global eventLoop tcl_prompt1 long_command
- 	set l [gets stdin]
- 	if {[eof stdin]} {
- 	    set eventLoop "done"     ;# terminate the vwait eventloop
- 	} else {
- 	    if {[string compare $l {}]} {
- 		append long_command "\n$l"
- 		set l $long_command
- 		if {[info complete $l]} {
- 		    if {[catch {uplevel \#0 history add [list $l] exec} err]} {
- 			puts stderr $err
- 		    } elseif {[string compare $err {}]} {
- 			puts $err
- 		    }
- 		    set long_command ""
- 		    catch $tcl_prompt1
- 		} else {
- 		    puts -nonewline "> "
- 		}
- 	    } elseif {![string compare $long_command {}]} {
- 		catch $tcl_prompt1
- 	    } else {
- 		puts -nonewline "> "
- 	    }
- 	    flush stdout
- 	}
-     }
-
-     # set up our keyboard read event handler:
-     # Vector stdin data to the socket
-     fileevent stdin readable read_stdin
-
-     catch $tcl_prompt1
-     flush stdout
-     # wait for and handle or stdin events...
-     #vwait eventLoop
- }
-
diff --git a/openair3/EMULATIONS/INTRA/vnmanager.tcl b/openair3/EMULATIONS/INTRA/vnmanager.tcl
deleted file mode 100644
index dcdd7f87b2..0000000000
--- a/openair3/EMULATIONS/INTRA/vnmanager.tcl
+++ /dev/null
@@ -1,161 +0,0 @@
-#
-# Management Script for Virtual Networking User-Mode-Linux
-# Author: Huu-Nghia Nguyen
-# Email: Huu-Nghia.Nguyen@eurecom.fr
-# Eurecom Institute
-#
-
-Class VirtualMachine
-proc flatten list {return [string map {\{ "" \} ""} $list]}
-
-VirtualMachine instproc init {vm_opt_list} {
-        $self instvar opt sname
-	array set sname {}
-	array set opt $vm_opt_list
-	set dir [split $opt(uml_dir) "/"]
-	set len [llength $dir]
-        set opt(vmid) [lindex $dir [expr $len-2]]
-        set opt(scenario) [lindex $dir [expr $len-4]]
-        puts "VM ($opt(scenario).$opt(vmid)) running in $opt(uml_dir) is created"
-}
-
-VirtualMachine instproc mconsole args {
-	$self instvar opt
-	set dir $opt(uml_dir)$opt(umid)
-	set cmdline "cd $dir && uml_mconsole mconsole [flatten $args]"
-	puts "execute the command: $cmdline"
-	set result [exec sh -c "cd $dir && uml_mconsole mconsole [flatten $args]" 2>/dev/null]
-	return $result
-}
-
-VirtualMachine instproc getinfo {param idx} {
-	$self instvar opt
-	return [lindex [split $opt($param) ","] $idx]
-}
-
-########################################################################
-#								       	
-#                    PARSE THE ENVIRONMENT                             
-#								       
-########################################################################
-set vm_cmds [exec  ps -ef | grep linux | grep airnet | sed s/.*linux//g | sort | uniq ]
-
-## Split into vm_cmd_lines
-set vm_cmd_lines [split $vm_cmds "\n"]
-array unset vms
-set stdout "/mnt/hostfs/stdout"
-set stderr "/mnt/hostfs/stdout"
-set filestdout ""
-
-## Iterate over the vm_cmd_lines
-foreach cmd  $vm_cmd_lines {
-	#puts "---------\nAnalyse the command line:"
-	#puts $cmd
-	set params [split $cmd " "]
-	array unset opt
-	foreach param  $params {
-		set fields [split $param "="]
-		set optname [lindex $fields 0]
-		set optval [lindex $fields 1] 
-		if {$optval != ""} {
-			set opt($optname) $optval
-		}
-	}
-
-	if {[array size opt] > 0} {
-		set vm [new VirtualMachine [array get opt]]
-		set vms([$vm set opt(vmid)]) $vm		
-	}
-}
-
-########################################################################
-#								       	
-#                    COMMAND IMPLEMENTATION                               
-#								       
-########################################################################
-
-set helpstr "Command list:\n\
-		\tconfig <vm> <device\[=options\]>: querry/add a new device to <vm>\n\
-		\tjob <vm> <command>: execute a command in <vm> using sh -c\n\
-		\tresult <vm>: return result of last job\n\
-		\tterm  <vm> <conid>: open the console <conid> of <vm>\n\
-		\tmconsole <vm> <args>: run uml_mconsole for <vm>\n\
-		\tsetdest <x> <y> <speed>: \n\t\tset destination (<x>, <y>) for the MN with the speed of <speed> m/s\n"
-proc help {} {
-	global helpstr
-	puts $helpstr
-}
-
-
-proc config {vmid args} {
-	global vms
-	set vm $vms($vmid)
-	return [$vm mconsole config $args]
-}
-
-proc job {vmid args} {
-	global vms filestdout
-	global stdout stderr
-	set vm $vms($vmid)
-	catch { exec rm opt(uml_dir)]/hostfs/$stdout }
-	return [$vm mconsole exec "'" $args ">$stdout 2>$stderr '"]
-        regsub {(.*)/(.*)} $stdout {\2} filename
-        set filestdout [$vm set opt(uml_dir)]/hostfs/$filename
-        exec cat $filestdout
-
-}
-
-proc lastresult {} {
-	exec cat $filestdout
-}
-
-proc result {vmid} {
-        global vms
-        global stdout stderr
-        set vm $vms($vmid)
-	regsub {(.*)/(.*)} $stdout {\2} filename
-	set filestdout [$vm set opt(uml_dir)]/hostfs/$filename
-        exec cat $filestdout 
-}
-
-proc term {vmid conid} {
-	global vms
-	set vm $vms($vmid)
-	
-	#Create screen name 
-	set result [$vm mconsole config $conid]
-	regsub {(.*):(.*)} $result {\2} device
-	regsub {(.*)/(\d+)} $device {\2} devid
-	set screenname "$conid$devid$vmid"
-
-	#Try to look up in the env if the screen exist?
-	set filename /tmp/vnman-screen-[pid].cfg
-	catch {	exec screen -ls > $filename } {}
-	set output [split [exec cat $filename] "\n"]
-	if {[lsearch -regex $output ".*$screenname.*"] < 0} {exec screen -d -m -S $screenname $device}
-	catch { exec rm -f $filename}
-
-	#Show the terminal
-	exec konsole -e screen -d -r $screenname &
-	
-}
-
-proc mconsole {vmid args} {
-	global vms
-	set vm $vms($vmid)
-	return [$vm mconsole $args]
-} 
-########################################################################
-#								       	
-#                    COMMAND LINE INTERFACE                              
-#								       
-########################################################################
-
-puts "VM lists: [array names vms]"
-help
-source vninteractive.tcl
-source wirelesstopo.tcl
-stop
-
-
-
diff --git a/openair3/EMULATIONS/INTRA/wirelesstopo.tcl b/openair3/EMULATIONS/INTRA/wirelesstopo.tcl
deleted file mode 100644
index 766deb4fab..0000000000
--- a/openair3/EMULATIONS/INTRA/wirelesstopo.tcl
+++ /dev/null
@@ -1,174 +0,0 @@
-#! /bin/nse
-
-# An example script for the usage of ns-2 in emulation mode:
-# Uses:
-# 1. Network/Daemon agents (by Huu-Nghia.Nguyen@eurecom.fr) to access to a uml_switch at level II 
-# 2. Tap/Raw agents to map between real MAC addresses and NS-2 IP addresses
-# 3. In-memory compression of the trace file to reduce disk write operations during simulation
-#	(currently done via gzip)
-
-
-# Common variables
-# 
-
-set scriptname		routingdemo
-set val(chan)           Channel/WirelessChannel    ;# Channel Type
-set val(prop)           Propagation/TwoRayGround   ;# radio-propagation model
-set val(netif)          Phy/WirelessPhy            ;# network interface type
-set val(mac)            Mac/802_11                 ;# MAC type
-set val(ifq)            Queue/DropTail/PriQueue    ;# interface queue type
-set val(ll)             LL                         ;# link layer type
-set val(ant)            Antenna/OmniAntenna        ;# antenna model
-set val(ifqlen)         50                         ;# max packet in ifq
-set val(x)              800			   ;# x range in meters
-set val(y)              600			   ;# y range in meters
-set val(rp)		DumbAgent		   ;# routing protocol
-set val(nn)		7			   ;# number of mobile nodes
-#set val(stime)		200.0			   ;# simulation time
-set val(stime)		360000.0		   ;# simulation time = 100 hours
-
-set ns	[new Simulator]
-$ns use-scheduler RealTime
-
-set tracefd  [open $scriptname.tr w]
-$ns trace-all $tracefd
-
-#set namtrace [open $scriptname.nam w]
-#set namtrace [open "|nam -r 0.1 -" w]
-#$ns namtrace-all-wireless $namtrace $val(x) $val(y)
-
-#Procedure needed when running nam in real-time
-proc NamTime {} {
-	#Send time to nam periodically
-	global ns namtrace
-	set now [$ns now]
-	set next [expr $now + 0.05]
-	puts $namtrace "T -t $now"
-	flush $namtrace
-	$ns at $next "NamTime"
-}
-
-#$ns at 1.0 "NamTime"
-
-proc UniformErr {} {
-    set err [new ErrorModel]
-    $err unit packet
-    $err set rate_ 0.01
-    $err ranvar [new RandomVariable/Uniform]
-    $err drop-target [new Agent/Null]
-    return $err
-}
-
-set topo [new Topography]
-
-$topo load_flatgrid $val(x) $val(y)
-
-# Create GOD
-create-god $val(nn)
-
-# Create channel
-set chan_1 [new $val(chan)]
-set chan_2 [new $val(chan)]
-
-# Configure node parameters
-$ns node-config -adhocRouting $val(rp) \
-	-llType $val(ll) \
-	-macType $val(mac) \
-	-ifqType $val(ifq) \
-	-ifqLen $val(ifqlen) \
-	-antType $val(ant) \
-	-propType $val(prop) \
-	-phyType $val(netif) \
-	-topoInstance $topo \
-	-agentTrace ON \
-	-routerTrace ON \
-	-macTrace ON \
-	-movementTrace ON \
-	-channel $chan_1 \
-	-IncomingErrProc UniformErr
-
-#Procedure to configure an ns-2 node initially
-proc setup_node {id x y z color} {
-	global ns node_
-	set node_($id) [$ns node]
-	$node_($id) set X_ $x
-	$node_($id) set Y_ $y
-	$node_($id) set Z_ $z
-	$node_($id) color $color
-	$ns at 0 "$node_($id) setdest $x $y 0"
-	$ns at 0 "$node_($id) color $color"
-	$node_($id) random-motion 0
-}
-			
-#Topo table:
-#set CN $vms(CN)
-set CH $vms(CH)
-set MR1 $vms(MR1)
-set MR2 $vms(MR2)
-set MN1 $vms(MN1)
-set MN2 $vms(MN2)
-set map(1) [list $CH eth0 $chan_1 300 100 0 "black"]
-
-set map(2) [list $MR1 eth1 $chan_1 100 100 0 "green"]
-set map(3) [list $MR1 eth0 $chan_2 100 100 0 "green"]
-set map(4) [list $MR2 eth1 $chan_1 500 100 0 "green"]
-set map(5) [list $MR2 eth0 $chan_2 500 100 0 "green"]
-
-set map(6) [list $MN1 eth0 $chan_2 150 100 0 "red"]
-set map(7) [list $MN2 eth0 $chan_2 450 100 0 "red"]
-	
-Agent/Tap set maxpkt_ 1500
-for {set i 1} {$i <= $val(nn)} {incr i} {
-	$ns node-config -channel [lindex $map($i) 2]
-	puts  "setup_node $i [lindex $map($i) 3]  [lindex $map($i) 4]  [lindex $map($i) 5]  [lindex $map($i) 6]"
-	setup_node $i [lindex $map($i) 3]  [lindex $map($i) 4]  [lindex $map($i) 5]  [lindex $map($i) 6]
-
-	$ns at 0 "$node_($i) start";
-    	$ns at $val(stime) "$node_($i) reset";
-
-	#set raw($i) [new Network/Raw]
-	set raw($i) [new Network/Daemon]
-	set node [lindex $map($i) 0]
-	set iff [lindex $map($i) 1]
-	puts  [$node getinfo $iff 1]
-	#$raw($i) open [$node getinfo $iff 1] readwrite
-	$raw($i) open [$node getinfo $iff 3] readwrite
-	
-	#Tap Agent for each node
-	puts  [$node getinfo $iff 2]
-	#set tagent($i) [new Agent/Tap/Raw [$node getinfo $iff 2]]
-#	if {$node == $MR2 && $iff == "eth0"} {
-#		set tagent($i) [new Agent/Tap/Raw fe:fd:0:0:3:0]
-#	} else { 
-		set tagent($i) [new Agent/Tap/Raw [$node getinfo $iff 1]]
-#	}
-	$tagent($i) network $raw($i)
-	$ns attach-agent $node_($i) $tagent($i)
-}
-
-$ns at $val(stime) "stop"
-$ns at $val(stime) "puts \"NS EXITING ...\" ; $ns halt"
-
-proc setdest_1 { x y speed} {
-	global node_
-	$node_(6) setdest $x $y $speed
-}
-proc setdest_2 { x y speed} {
-	global node_
-	$node_(7) setdest $x $y $speed
-}
-
-proc stop {} {
-	global ns tracefd raw 
-	$ns flush-trace
-	close $tracefd
-	for {set i 1} {$i <= $val(nn)} {incr i} {
-		$raw($i) close
-	}
-}
-	
-
-source utils.tcl    
-puts "okey"
-	
-$ns run