From 09ba7490bde7c0d643e78859fc9eb87b7dbf90ed Mon Sep 17 00:00:00 2001
From: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Date: Thu, 13 Aug 2020 12:11:33 +0200
Subject: [PATCH] Support multiple revisions of the same YANG file

Yang file names are suffixed by a revision date

Issue-ID: OAM-146
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
Change-Id: Ica15fc002dbdb677d184a8a69b5dd625f911ea85
Signed-off-by: Ravi Pendurty <ravi.pendurty@highstreet-technologies.com>
---
 ...hardware.yang => iana-hardware@2018-03-13.yang} |   0
 ...a-if-type.yang => iana-if-type@2017-01-19.yang} |   0
 ...etf-alarms.yang => ietf-alarms@2019-09-11.yang} |   0
 ...ypes.yang => ietf-crypto-types@2019-10-18.yang} |   0
 ...ypes.yang => ietf-dhcpv6-types@2018-01-30.yang} |   0
 ...hardware.yang => ietf-hardware@2018-03-13.yang} |   0
 ...-types.yang => ietf-inet-types@2013-07-15.yang} |   0
 ...rfaces.yang => ietf-interfaces@2018-02-20.yang} |   0
 .../ietf/{ietf-ip.yang => ietf-ip@2018-02-22.yang} |   0
 ...f-acm.yang => ietf-netconf-acm@2018-02-14.yang} |   0
 ...ang => ietf-netconf-monitoring@2010-10-04.yang} |   0
 ...-types.yang => ietf-yang-types@2013-07-15.yang} |   0
 .../yang/published/o-ran/ru-fh/iana-hardware.yang  |   1 -
 .../o-ran/ru-fh/iana-hardware@2018-03-13.yang      |   1 +
 .../yang/published/o-ran/ru-fh/iana-if-type.yang   |   1 -
 .../o-ran/ru-fh/iana-if-type@2017-01-19.yang       |   1 +
 .../o-ran/ru-fh/ietf-alarms@2019-09-11.yang        |   1 +
 .../published/o-ran/ru-fh/ietf-crypto-types.yang   |   1 -
 .../o-ran/ru-fh/ietf-crypto-types@2019-10-18.yang  |   1 +
 .../published/o-ran/ru-fh/ietf-dhcpv6-types.yang   |   1 -
 .../o-ran/ru-fh/ietf-dhcpv6-types@2018-01-30.yang  |   1 +
 .../yang/published/o-ran/ru-fh/ietf-hardware.yang  |   1 -
 .../o-ran/ru-fh/ietf-hardware@2018-03-13.yang      |   1 +
 .../published/o-ran/ru-fh/ietf-inet-types.yang     |   1 -
 .../o-ran/ru-fh/ietf-inet-types@2013-07-15.yang    |   1 +
 .../published/o-ran/ru-fh/ietf-interfaces.yang     |   1 -
 .../o-ran/ru-fh/ietf-interfaces@2018-02-20.yang    |   1 +
 data-model/yang/published/o-ran/ru-fh/ietf-ip.yang |   1 -
 .../published/o-ran/ru-fh/ietf-ip@2018-02-22.yang  |   1 +
 .../published/o-ran/ru-fh/ietf-netconf-acm.yang    |   1 -
 .../o-ran/ru-fh/ietf-netconf-acm@2018-02-14.yang   |   1 +
 .../published/o-ran/ru-fh/ietf-yang-types.yang     |   1 -
 .../o-ran/ru-fh/ietf-yang-types@2013-07-15.yang    |   1 +
 .../o-ran/ru-fh/network-topology-simulator.yang    |   1 +
 ...ld-port.yang => o-ran-ald-port@2019-07-03.yang} |   0
 .../{o-ran-ald.yang => o-ran-ald@2019-07-03.yang}  |   0
 ...g => o-ran-antenna-calibration@2019-07-03.yang} |   0
 ...ming.yang => o-ran-beamforming@2019-07-03.yang} |   0
 ...g => o-ran-compression-factors@2019-07-03.yang} |   0
 ...yang => o-ran-delay-management@2019-07-03.yang} |   0
 ...{o-ran-dhcp.yang => o-ran-dhcp@2019-07-03.yang} |   0
 ...elay.yang => o-ran-ecpri-delay@2019-02-04.yang} |   0
 ...nalio.yang => o-ran-externalio@2019-07-03.yang} |   0
 .../{o-ran-fan.yang => o-ran-fan@2019-07-03.yang}  |   0
 ....yang => o-ran-file-management@2019-07-03.yang} |   0
 .../{o-ran-fm.yang => o-ran-fm@2019-02-04.yang}    |   0
 .../o-ran/ru-fh/o-ran-hardware@2019-03-28.yang     | 271 +++++++++++++++++++
 ...ardware.yang => o-ran-hardware@2019-07-03.yang} |   0
 ...faces.yang => o-ran-interfaces@2019-07-03.yang} |   0
 ...s.yang => o-ran-laa-operations@2019-07-03.yang} |   0
 .../{o-ran-laa.yang => o-ran-laa@2019-07-03.yang}  |   0
 .../{o-ran-lbm.yang => o-ran-lbm@2019-02-04.yang}  |   0
 ...e-cap.yang => o-ran-module-cap@2019-07-03.yang} |   0
 ...e-int.yang => o-ran-mplane-int@2019-07-03.yang} |   0
 ...tions.yang => o-ran-operations@2019-07-03.yang} |   0
 ...> o-ran-performance-management@2019-07-03.yang} |   0
 ...ng => o-ran-processing-element@2019-07-03.yang} |   0
 ...g => o-ran-software-management@2019-07-03.yang} |   0
 ...sion.yang => o-ran-supervision@2019-07-03.yang} |   0
 ...{o-ran-sync.yang => o-ran-sync@2019-07-03.yang} |   0
 ...-ran-trace.yang => o-ran-trace@2019-07-03.yang} |   0
 ...iver.yang => o-ran-transceiver@2019-07-03.yang} |   0
 ....yang => o-ran-troubleshooting@2019-02-04.yang} |   0
 ...dp-echo.yang => o-ran-udp-echo@2019-02-04.yang} |   0
 ...conf.yang => o-ran-uplane-conf@2019-07-03.yang} |   0
 ...sermgmt.yang => o-ran-usermgmt@2019-07-03.yang} |   0
 data-model/yang/published/xran/iana-hardware.yang  |   1 -
 .../published/xran/iana-hardware@2018-03-13.yang   |   1 +
 data-model/yang/published/xran/iana-if-type.yang   |   1 -
 .../published/xran/iana-if-type@2017-01-19.yang    |   1 +
 .../yang/published/xran/ietf-dhcpv6-types.yang     |   1 -
 .../xran/ietf-dhcpv6-types@2018-01-30.yang         |   1 +
 data-model/yang/published/xran/ietf-hardware.yang  |   1 -
 .../published/xran/ietf-hardware@2018-03-13.yang   |   1 +
 .../yang/published/xran/ietf-inet-types.yang       |   1 -
 .../published/xran/ietf-inet-types@2013-07-15.yang |   1 +
 .../yang/published/xran/ietf-interfaces.yang       |   1 -
 .../published/xran/ietf-interfaces@2018-02-20.yang |   1 +
 data-model/yang/published/xran/ietf-ip.yang        |   1 -
 .../yang/published/xran/ietf-ip@2018-02-22.yang    |   1 +
 .../yang/published/xran/ietf-yang-types.yang       |   1 -
 .../published/xran/ietf-yang-types@2013-07-15.yang |   1 +
 ...alarm-id.yang => xran-alarm-id@2018-07-20.yang} |   0
 ...ald-port.yang => xran-ald-port@2018-07-20.yang} |   0
 .../{xran-ald.yang => xran-ald@2018-07-20.yang}    |   0
 ...rming.yang => xran-beamforming@2018-07-20.yang} |   0
 ....yang => xran-delay-management@2018-07-20.yang} |   0
 .../{xran-dhcp.yang => xran-dhcp@2018-07-20.yang}  |   0
 ...delay.yang => xran-ecpri-delay@2018-07-20.yang} |   0
 ...rnalio.yang => xran-externalio@2018-07-20.yang} |   0
 .../{xran-fan.yang => xran-fan@2018-07-20.yang}    |   0
 ...t.yang => xran-file-management@2018-07-20.yang} |   0
 .../xran/{xran-fm.yang => xran-fm@2018-07-20.yang} |   0
 ...hardware.yang => xran-hardware@2018-07-20.yang} |   0
 ...rfaces.yang => xran-interfaces@2018-07-20.yang} |   0
 .../{xran-lbm.yang => xran-lbm@2018-07-20.yang}    |   0
 ...le-cap.yang => xran-module-cap@2018-07-20.yang} |   0
 ...ne-int.yang => xran-mplane-int@2018-07-20.yang} |   0
 ...ations.yang => xran-operations@2018-07-20.yang} |   0
 ...=> xran-performance-management@2018-07-20.yang} |   0
 ...ang => xran-processing-element@2018-07-20.yang} |   0
 ...ng => xran-software-management@2018-07-20.yang} |   0
 ...ision.yang => xran-supervision@2018-07-20.yang} |   0
 .../{xran-sync.yang => xran-sync@2018-07-20.yang}  |   0
 ...eiver.yang => xran-transceiver@2018-07-20.yang} |   0
 ...g.yang => xran-troubleshooting@2018-07-20.yang} |   0
 ...udp-echo.yang => xran-udp-echo@2018-07-20.yang} |   0
 ...-conf.yang => xran-uplane-conf@2018-07-20.yang} |   0
 ...usermgmt.yang => xran-usermgmt@2018-07-20.yang} |   0
 .../nts-manager/network-topology-simulator.yang    | 297 +++++++++++++++++++++
 .../o-ran/ru-fh/src/main/yang/iana-hardware.yang   |   1 -
 .../src/main/yang/iana-hardware@2018-03-13.yang    |   1 +
 .../o-ran/ru-fh/src/main/yang/iana-if-type.yang    |   1 -
 .../src/main/yang/iana-if-type@2017-01-19.yang     |   1 +
 .../src/main/yang/ietf-alarms@2019-09-11.yang      |   1 +
 .../ru-fh/src/main/yang/ietf-crypto-types.yang     |   1 -
 .../main/yang/ietf-crypto-types@2019-10-18.yang    |   1 +
 .../ru-fh/src/main/yang/ietf-dhcpv6-types.yang     |   1 -
 .../main/yang/ietf-dhcpv6-types@2018-01-30.yang    |   1 +
 .../o-ran/ru-fh/src/main/yang/ietf-hardware.yang   |   1 -
 .../src/main/yang/ietf-hardware@2018-03-13.yang    |   1 +
 .../o-ran/ru-fh/src/main/yang/ietf-inet-types.yang |   1 -
 .../src/main/yang/ietf-inet-types@2013-07-15.yang  |   1 +
 .../o-ran/ru-fh/src/main/yang/ietf-interfaces.yang |   1 -
 .../src/main/yang/ietf-interfaces@2018-02-20.yang  |   1 +
 features/o-ran/ru-fh/src/main/yang/ietf-ip.yang    |   1 -
 .../ru-fh/src/main/yang/ietf-ip@2018-02-22.yang    |   1 +
 .../ru-fh/src/main/yang/ietf-netconf-acm.yang      |   1 -
 .../src/main/yang/ietf-netconf-acm@2018-02-14.yang |   1 +
 .../o-ran/ru-fh/src/main/yang/ietf-yang-types.yang |   1 -
 .../src/main/yang/ietf-yang-types@2013-07-15.yang  |   1 +
 .../o-ran/ru-fh/src/main/yang/o-ran-ald-port.yang  |   1 -
 .../src/main/yang/o-ran-ald-port@2019-07-03.yang   |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-ald.yang  |   1 -
 .../ru-fh/src/main/yang/o-ran-ald@2019-07-03.yang  |   1 +
 .../src/main/yang/o-ran-antenna-calibration.yang   |   1 -
 .../yang/o-ran-antenna-calibration@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-beamforming.yang     |   1 -
 .../main/yang/o-ran-beamforming@2019-07-03.yang    |   1 +
 .../src/main/yang/o-ran-compression-factors.yang   |   1 -
 .../yang/o-ran-compression-factors@2019-07-03.yang |   1 +
 .../src/main/yang/o-ran-delay-management.yang      |   1 -
 .../yang/o-ran-delay-management@2019-07-03.yang    |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-dhcp.yang |   1 -
 .../ru-fh/src/main/yang/o-ran-dhcp@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-ecpri-delay.yang     |   1 -
 .../main/yang/o-ran-ecpri-delay@2019-02-04.yang    |   1 +
 .../ru-fh/src/main/yang/o-ran-externalio.yang      |   1 -
 .../src/main/yang/o-ran-externalio@2019-07-03.yang |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-fan.yang  |   1 -
 .../ru-fh/src/main/yang/o-ran-fan@2019-07-03.yang  |   1 +
 .../ru-fh/src/main/yang/o-ran-file-management.yang |   1 -
 .../yang/o-ran-file-management@2019-07-03.yang     |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-fm.yang   |   1 -
 .../ru-fh/src/main/yang/o-ran-fm@2019-02-04.yang   |   1 +
 .../o-ran/ru-fh/src/main/yang/o-ran-hardware.yang  |   1 -
 .../src/main/yang/o-ran-hardware@2019-07-03.yang   |   1 +
 .../ru-fh/src/main/yang/o-ran-interfaces.yang      |   1 -
 .../src/main/yang/o-ran-interfaces@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-laa-operations.yang  |   1 -
 .../main/yang/o-ran-laa-operations@2019-07-03.yang |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-laa.yang  |   1 -
 .../ru-fh/src/main/yang/o-ran-laa@2019-07-03.yang  |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-lbm.yang  |   1 -
 .../ru-fh/src/main/yang/o-ran-lbm@2019-02-04.yang  |   1 +
 .../ru-fh/src/main/yang/o-ran-module-cap.yang      |   1 -
 .../src/main/yang/o-ran-module-cap@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-mplane-int.yang      |   1 -
 .../src/main/yang/o-ran-mplane-int@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-operations.yang      |   1 -
 .../src/main/yang/o-ran-operations@2019-07-03.yang |   1 +
 .../main/yang/o-ran-performance-management.yang    |   1 -
 .../o-ran-performance-management@2019-07-03.yang   |   1 +
 .../src/main/yang/o-ran-processing-element.yang    |   1 -
 .../yang/o-ran-processing-element@2019-07-03.yang  |   1 +
 .../src/main/yang/o-ran-software-management.yang   |   1 -
 .../yang/o-ran-software-management@2019-07-03.yang |   1 +
 .../ru-fh/src/main/yang/o-ran-supervision.yang     |   1 -
 .../main/yang/o-ran-supervision@2019-07-03.yang    |   1 +
 features/o-ran/ru-fh/src/main/yang/o-ran-sync.yang |   1 -
 .../ru-fh/src/main/yang/o-ran-sync@2019-07-03.yang |   1 +
 .../o-ran/ru-fh/src/main/yang/o-ran-trace.yang     |   1 -
 .../src/main/yang/o-ran-trace@2019-07-03.yang      |   1 +
 .../ru-fh/src/main/yang/o-ran-transceiver.yang     |   1 -
 .../main/yang/o-ran-transceiver@2019-07-03.yang    |   1 +
 .../ru-fh/src/main/yang/o-ran-troubleshooting.yang |   1 -
 .../yang/o-ran-troubleshooting@2019-02-04.yang     |   1 +
 .../o-ran/ru-fh/src/main/yang/o-ran-udp-echo.yang  |   1 -
 .../src/main/yang/o-ran-udp-echo@2019-02-04.yang   |   1 +
 .../ru-fh/src/main/yang/o-ran-uplane-conf.yang     |   1 -
 .../main/yang/o-ran-uplane-conf@2019-07-03.yang    |   1 +
 .../o-ran/ru-fh/src/main/yang/o-ran-usermgmt.yang  |   1 -
 .../src/main/yang/o-ran-usermgmt@2019-07-03.yang   |   1 +
 .../x-ran/ru-fh/src/main/yang/iana-hardware.yang   |   1 -
 .../src/main/yang/iana-hardware@2018-03-13.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/iana-if-type.yang    |   1 -
 .../src/main/yang/iana-if-type@2017-01-19.yang     |   1 +
 .../src/main/yang/ietf-alarms@2019-09-11.yang      |   1 +
 .../ru-fh/src/main/yang/ietf-dhcpv6-types.yang     |   1 -
 .../main/yang/ietf-dhcpv6-types@2018-01-30.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/ietf-hardware.yang   |   1 -
 .../src/main/yang/ietf-hardware@2018-03-13.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/ietf-inet-types.yang |   1 -
 .../src/main/yang/ietf-inet-types@2013-07-15.yang  |   1 +
 .../x-ran/ru-fh/src/main/yang/ietf-interfaces.yang |   1 -
 .../src/main/yang/ietf-interfaces@2018-02-20.yang  |   1 +
 features/x-ran/ru-fh/src/main/yang/ietf-ip.yang    |   1 -
 .../ru-fh/src/main/yang/ietf-ip@2018-02-22.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/ietf-yang-types.yang |   1 -
 .../src/main/yang/ietf-yang-types@2013-07-15.yang  |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-alarm-id.yang   |   1 -
 .../src/main/yang/xran-alarm-id@2018-07-20.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-ald-port.yang   |   1 -
 .../src/main/yang/xran-ald-port@2018-07-20.yang    |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-ald.yang   |   1 -
 .../ru-fh/src/main/yang/xran-ald@2018-07-20.yang   |   1 +
 .../ru-fh/src/main/yang/xran-beamforming.yang      |   1 -
 .../src/main/yang/xran-beamforming@2018-07-20.yang |   1 +
 .../ru-fh/src/main/yang/xran-delay-management.yang |   1 -
 .../yang/xran-delay-management@2018-07-20.yang     |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-dhcp.yang  |   1 -
 .../ru-fh/src/main/yang/xran-dhcp@2018-07-20.yang  |   1 +
 .../ru-fh/src/main/yang/xran-ecpri-delay.yang      |   1 -
 .../src/main/yang/xran-ecpri-delay@2018-07-20.yang |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-externalio.yang |   1 -
 .../src/main/yang/xran-externalio@2018-07-20.yang  |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-fan.yang   |   1 -
 .../ru-fh/src/main/yang/xran-fan@2018-07-20.yang   |   1 +
 .../ru-fh/src/main/yang/xran-file-management.yang  |   1 -
 .../main/yang/xran-file-management@2018-07-20.yang |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-fm.yang    |   1 -
 .../ru-fh/src/main/yang/xran-fm@2018-07-20.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-hardware.yang   |   1 -
 .../src/main/yang/xran-hardware@2018-07-20.yang    |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-interfaces.yang |   1 -
 .../src/main/yang/xran-interfaces@2018-07-20.yang  |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-lbm.yang   |   1 -
 .../ru-fh/src/main/yang/xran-lbm@2018-07-20.yang   |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-module-cap.yang |   1 -
 .../src/main/yang/xran-module-cap@2018-07-20.yang  |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-mplane-int.yang |   1 -
 .../src/main/yang/xran-mplane-int@2018-07-20.yang  |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-operations.yang |   1 -
 .../src/main/yang/xran-operations@2018-07-20.yang  |   1 +
 .../src/main/yang/xran-performance-management.yang |   1 -
 .../xran-performance-management@2018-07-20.yang    |   1 +
 .../src/main/yang/xran-processing-element.yang     |   1 -
 .../yang/xran-processing-element@2018-07-20.yang   |   1 +
 .../src/main/yang/xran-software-management.yang    |   1 -
 .../yang/xran-software-management@2018-07-20.yang  |   1 +
 .../ru-fh/src/main/yang/xran-supervision.yang      |   1 -
 .../src/main/yang/xran-supervision@2018-07-20.yang |   1 +
 features/x-ran/ru-fh/src/main/yang/xran-sync.yang  |   1 -
 .../ru-fh/src/main/yang/xran-sync@2018-07-20.yang  |   1 +
 .../ru-fh/src/main/yang/xran-transceiver.yang      |   1 -
 .../src/main/yang/xran-transceiver@2018-07-20.yang |   1 +
 .../ru-fh/src/main/yang/xran-troubleshooting.yang  |   1 -
 .../main/yang/xran-troubleshooting@2018-07-20.yang |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-udp-echo.yang   |   1 -
 .../src/main/yang/xran-udp-echo@2018-07-20.yang    |   1 +
 .../ru-fh/src/main/yang/xran-uplane-conf.yang      |   1 -
 .../src/main/yang/xran-uplane-conf@2018-07-20.yang |   1 +
 .../x-ran/ru-fh/src/main/yang/xran-usermgmt.yang   |   1 -
 .../src/main/yang/xran-usermgmt@2018-07-20.yang    |   1 +
 264 files changed, 666 insertions(+), 94 deletions(-)
 rename data-model/yang/published/ietf/{iana-hardware.yang => iana-hardware@2018-03-13.yang} (100%)
 rename data-model/yang/published/ietf/{iana-if-type.yang => iana-if-type@2017-01-19.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-alarms.yang => ietf-alarms@2019-09-11.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-crypto-types.yang => ietf-crypto-types@2019-10-18.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-dhcpv6-types.yang => ietf-dhcpv6-types@2018-01-30.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-hardware.yang => ietf-hardware@2018-03-13.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-inet-types.yang => ietf-inet-types@2013-07-15.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-interfaces.yang => ietf-interfaces@2018-02-20.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-ip.yang => ietf-ip@2018-02-22.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-netconf-acm.yang => ietf-netconf-acm@2018-02-14.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-netconf-monitoring.yang => ietf-netconf-monitoring@2010-10-04.yang} (100%)
 rename data-model/yang/published/ietf/{ietf-yang-types.yang => ietf-yang-types@2013-07-15.yang} (100%)
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/iana-hardware.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/iana-hardware@2018-03-13.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/iana-if-type.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/iana-if-type@2017-01-19.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-alarms@2019-09-11.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-crypto-types.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-crypto-types@2019-10-18.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types@2018-01-30.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-hardware.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-hardware@2018-03-13.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-inet-types.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-inet-types@2013-07-15.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-interfaces.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-interfaces@2018-02-20.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-ip.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-ip@2018-02-22.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm@2018-02-14.yang
 delete mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-yang-types.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/ietf-yang-types@2013-07-15.yang
 create mode 120000 data-model/yang/published/o-ran/ru-fh/network-topology-simulator.yang
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-ald-port.yang => o-ran-ald-port@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-ald.yang => o-ran-ald@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-antenna-calibration.yang => o-ran-antenna-calibration@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-beamforming.yang => o-ran-beamforming@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-compression-factors.yang => o-ran-compression-factors@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-delay-management.yang => o-ran-delay-management@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-dhcp.yang => o-ran-dhcp@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-ecpri-delay.yang => o-ran-ecpri-delay@2019-02-04.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-externalio.yang => o-ran-externalio@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-fan.yang => o-ran-fan@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-file-management.yang => o-ran-file-management@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-fm.yang => o-ran-fm@2019-02-04.yang} (100%)
 create mode 100644 data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-03-28.yang
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-hardware.yang => o-ran-hardware@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-interfaces.yang => o-ran-interfaces@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-laa-operations.yang => o-ran-laa-operations@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-laa.yang => o-ran-laa@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-lbm.yang => o-ran-lbm@2019-02-04.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-module-cap.yang => o-ran-module-cap@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-mplane-int.yang => o-ran-mplane-int@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-operations.yang => o-ran-operations@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-performance-management.yang => o-ran-performance-management@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-processing-element.yang => o-ran-processing-element@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-software-management.yang => o-ran-software-management@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-supervision.yang => o-ran-supervision@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-sync.yang => o-ran-sync@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-trace.yang => o-ran-trace@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-transceiver.yang => o-ran-transceiver@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-troubleshooting.yang => o-ran-troubleshooting@2019-02-04.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-udp-echo.yang => o-ran-udp-echo@2019-02-04.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-uplane-conf.yang => o-ran-uplane-conf@2019-07-03.yang} (100%)
 rename data-model/yang/published/o-ran/ru-fh/{o-ran-usermgmt.yang => o-ran-usermgmt@2019-07-03.yang} (100%)
 delete mode 120000 data-model/yang/published/xran/iana-hardware.yang
 create mode 120000 data-model/yang/published/xran/iana-hardware@2018-03-13.yang
 delete mode 120000 data-model/yang/published/xran/iana-if-type.yang
 create mode 120000 data-model/yang/published/xran/iana-if-type@2017-01-19.yang
 delete mode 120000 data-model/yang/published/xran/ietf-dhcpv6-types.yang
 create mode 120000 data-model/yang/published/xran/ietf-dhcpv6-types@2018-01-30.yang
 delete mode 120000 data-model/yang/published/xran/ietf-hardware.yang
 create mode 120000 data-model/yang/published/xran/ietf-hardware@2018-03-13.yang
 delete mode 120000 data-model/yang/published/xran/ietf-inet-types.yang
 create mode 120000 data-model/yang/published/xran/ietf-inet-types@2013-07-15.yang
 delete mode 120000 data-model/yang/published/xran/ietf-interfaces.yang
 create mode 120000 data-model/yang/published/xran/ietf-interfaces@2018-02-20.yang
 delete mode 120000 data-model/yang/published/xran/ietf-ip.yang
 create mode 120000 data-model/yang/published/xran/ietf-ip@2018-02-22.yang
 delete mode 120000 data-model/yang/published/xran/ietf-yang-types.yang
 create mode 120000 data-model/yang/published/xran/ietf-yang-types@2013-07-15.yang
 rename data-model/yang/published/xran/{xran-alarm-id.yang => xran-alarm-id@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-ald-port.yang => xran-ald-port@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-ald.yang => xran-ald@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-beamforming.yang => xran-beamforming@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-delay-management.yang => xran-delay-management@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-dhcp.yang => xran-dhcp@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-ecpri-delay.yang => xran-ecpri-delay@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-externalio.yang => xran-externalio@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-fan.yang => xran-fan@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-file-management.yang => xran-file-management@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-fm.yang => xran-fm@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-hardware.yang => xran-hardware@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-interfaces.yang => xran-interfaces@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-lbm.yang => xran-lbm@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-module-cap.yang => xran-module-cap@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-mplane-int.yang => xran-mplane-int@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-operations.yang => xran-operations@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-performance-management.yang => xran-performance-management@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-processing-element.yang => xran-processing-element@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-software-management.yang => xran-software-management@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-supervision.yang => xran-supervision@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-sync.yang => xran-sync@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-transceiver.yang => xran-transceiver@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-troubleshooting.yang => xran-troubleshooting@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-udp-echo.yang => xran-udp-echo@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-uplane-conf.yang => xran-uplane-conf@2018-07-20.yang} (100%)
 rename data-model/yang/published/xran/{xran-usermgmt.yang => xran-usermgmt@2018-07-20.yang} (100%)
 create mode 100644 data-model/yang/sim/nts-manager/network-topology-simulator.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/iana-hardware.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/iana-if-type.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-crypto-types.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-crypto-types@2019-10-18.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-hardware.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-inet-types.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-interfaces.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-ip.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm@2018-02-14.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-yang-types.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ald-port.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ald-port@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ald.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ald@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-beamforming.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-beamforming@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-delay-management.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-delay-management@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-dhcp.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-dhcp@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay@2019-02-04.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-externalio.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-externalio@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-fan.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-fan@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-file-management.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-file-management@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-fm.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-fm@2019-02-04.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-hardware.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-hardware@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-interfaces.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-interfaces@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-laa.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-laa@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-lbm.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-lbm@2019-02-04.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-module-cap.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-module-cap@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-operations.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-operations@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-performance-management.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-performance-management@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-processing-element.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-processing-element@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-software-management.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-software-management@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-supervision.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-supervision@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-sync.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-sync@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-trace.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-trace@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-transceiver.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-transceiver@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting@2019-02-04.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo@2019-02-04.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf@2019-07-03.yang
 delete mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt.yang
 create mode 120000 features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt@2019-07-03.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/iana-hardware.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/iana-if-type.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-hardware.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-inet-types.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-interfaces.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-ip.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-yang-types.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-alarm-id.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-alarm-id@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ald-port.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ald-port@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ald.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ald@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-beamforming.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-beamforming@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-delay-management.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-delay-management@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-dhcp.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-dhcp@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-externalio.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-externalio@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-fan.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-fan@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-file-management.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-file-management@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-fm.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-fm@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-hardware.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-hardware@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-interfaces.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-interfaces@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-lbm.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-lbm@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-module-cap.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-module-cap@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-mplane-int.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-mplane-int@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-operations.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-operations@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-performance-management.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-performance-management@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-processing-element.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-processing-element@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-software-management.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-software-management@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-supervision.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-supervision@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-sync.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-sync@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-transceiver.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-transceiver@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-troubleshooting.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-troubleshooting@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-udp-echo.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-udp-echo@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-uplane-conf.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-uplane-conf@2018-07-20.yang
 delete mode 120000 features/x-ran/ru-fh/src/main/yang/xran-usermgmt.yang
 create mode 120000 features/x-ran/ru-fh/src/main/yang/xran-usermgmt@2018-07-20.yang

diff --git a/data-model/yang/published/ietf/iana-hardware.yang b/data-model/yang/published/ietf/iana-hardware@2018-03-13.yang
similarity index 100%
rename from data-model/yang/published/ietf/iana-hardware.yang
rename to data-model/yang/published/ietf/iana-hardware@2018-03-13.yang
diff --git a/data-model/yang/published/ietf/iana-if-type.yang b/data-model/yang/published/ietf/iana-if-type@2017-01-19.yang
similarity index 100%
rename from data-model/yang/published/ietf/iana-if-type.yang
rename to data-model/yang/published/ietf/iana-if-type@2017-01-19.yang
diff --git a/data-model/yang/published/ietf/ietf-alarms.yang b/data-model/yang/published/ietf/ietf-alarms@2019-09-11.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-alarms.yang
rename to data-model/yang/published/ietf/ietf-alarms@2019-09-11.yang
diff --git a/data-model/yang/published/ietf/ietf-crypto-types.yang b/data-model/yang/published/ietf/ietf-crypto-types@2019-10-18.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-crypto-types.yang
rename to data-model/yang/published/ietf/ietf-crypto-types@2019-10-18.yang
diff --git a/data-model/yang/published/ietf/ietf-dhcpv6-types.yang b/data-model/yang/published/ietf/ietf-dhcpv6-types@2018-01-30.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-dhcpv6-types.yang
rename to data-model/yang/published/ietf/ietf-dhcpv6-types@2018-01-30.yang
diff --git a/data-model/yang/published/ietf/ietf-hardware.yang b/data-model/yang/published/ietf/ietf-hardware@2018-03-13.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-hardware.yang
rename to data-model/yang/published/ietf/ietf-hardware@2018-03-13.yang
diff --git a/data-model/yang/published/ietf/ietf-inet-types.yang b/data-model/yang/published/ietf/ietf-inet-types@2013-07-15.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-inet-types.yang
rename to data-model/yang/published/ietf/ietf-inet-types@2013-07-15.yang
diff --git a/data-model/yang/published/ietf/ietf-interfaces.yang b/data-model/yang/published/ietf/ietf-interfaces@2018-02-20.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-interfaces.yang
rename to data-model/yang/published/ietf/ietf-interfaces@2018-02-20.yang
diff --git a/data-model/yang/published/ietf/ietf-ip.yang b/data-model/yang/published/ietf/ietf-ip@2018-02-22.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-ip.yang
rename to data-model/yang/published/ietf/ietf-ip@2018-02-22.yang
diff --git a/data-model/yang/published/ietf/ietf-netconf-acm.yang b/data-model/yang/published/ietf/ietf-netconf-acm@2018-02-14.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-netconf-acm.yang
rename to data-model/yang/published/ietf/ietf-netconf-acm@2018-02-14.yang
diff --git a/data-model/yang/published/ietf/ietf-netconf-monitoring.yang b/data-model/yang/published/ietf/ietf-netconf-monitoring@2010-10-04.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-netconf-monitoring.yang
rename to data-model/yang/published/ietf/ietf-netconf-monitoring@2010-10-04.yang
diff --git a/data-model/yang/published/ietf/ietf-yang-types.yang b/data-model/yang/published/ietf/ietf-yang-types@2013-07-15.yang
similarity index 100%
rename from data-model/yang/published/ietf/ietf-yang-types.yang
rename to data-model/yang/published/ietf/ietf-yang-types@2013-07-15.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/iana-hardware.yang b/data-model/yang/published/o-ran/ru-fh/iana-hardware.yang
deleted file mode 120000
index 2e8ce77..0000000
--- a/data-model/yang/published/o-ran/ru-fh/iana-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/iana-hardware.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/iana-hardware@2018-03-13.yang b/data-model/yang/published/o-ran/ru-fh/iana-hardware@2018-03-13.yang
new file mode 120000
index 0000000..4478328
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/iana-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../ietf/iana-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/iana-if-type.yang b/data-model/yang/published/o-ran/ru-fh/iana-if-type.yang
deleted file mode 120000
index 848b86b..0000000
--- a/data-model/yang/published/o-ran/ru-fh/iana-if-type.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/iana-if-type.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/iana-if-type@2017-01-19.yang b/data-model/yang/published/o-ran/ru-fh/iana-if-type@2017-01-19.yang
new file mode 120000
index 0000000..1d6ff16
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/iana-if-type@2017-01-19.yang
@@ -0,0 +1 @@
+../../ietf/iana-if-type@2017-01-19.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-alarms@2019-09-11.yang b/data-model/yang/published/o-ran/ru-fh/ietf-alarms@2019-09-11.yang
new file mode 120000
index 0000000..e7d7ced
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-alarms@2019-09-11.yang
@@ -0,0 +1 @@
+../../ietf/ietf-alarms@2019-09-11.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types.yang b/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types.yang
deleted file mode 120000
index 64d57c4..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-crypto-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types@2019-10-18.yang b/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types@2019-10-18.yang
new file mode 120000
index 0000000..a84c53a
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-crypto-types@2019-10-18.yang
@@ -0,0 +1 @@
+../../ietf/ietf-crypto-types@2019-10-18.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types.yang b/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types.yang
deleted file mode 120000
index cae1ce6..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-dhcpv6-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types@2018-01-30.yang b/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types@2018-01-30.yang
new file mode 120000
index 0000000..338e628
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-dhcpv6-types@2018-01-30.yang
@@ -0,0 +1 @@
+../../ietf/ietf-dhcpv6-types@2018-01-30.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-hardware.yang b/data-model/yang/published/o-ran/ru-fh/ietf-hardware.yang
deleted file mode 120000
index 61516d7..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-hardware.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-hardware@2018-03-13.yang b/data-model/yang/published/o-ran/ru-fh/ietf-hardware@2018-03-13.yang
new file mode 120000
index 0000000..a157fff
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../ietf/ietf-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-inet-types.yang b/data-model/yang/published/o-ran/ru-fh/ietf-inet-types.yang
deleted file mode 120000
index bbc5909..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-inet-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-inet-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-inet-types@2013-07-15.yang b/data-model/yang/published/o-ran/ru-fh/ietf-inet-types@2013-07-15.yang
new file mode 120000
index 0000000..b0e4a90
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-inet-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../ietf/ietf-inet-types@2013-07-15.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-interfaces.yang b/data-model/yang/published/o-ran/ru-fh/ietf-interfaces.yang
deleted file mode 120000
index b4bc739..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-interfaces.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-interfaces@2018-02-20.yang b/data-model/yang/published/o-ran/ru-fh/ietf-interfaces@2018-02-20.yang
new file mode 120000
index 0000000..d96495a
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1 @@
+../../ietf/ietf-interfaces@2018-02-20.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-ip.yang b/data-model/yang/published/o-ran/ru-fh/ietf-ip.yang
deleted file mode 120000
index 6f3e39c..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-ip.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-ip.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-ip@2018-02-22.yang b/data-model/yang/published/o-ran/ru-fh/ietf-ip@2018-02-22.yang
new file mode 120000
index 0000000..64939c1
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-ip@2018-02-22.yang
@@ -0,0 +1 @@
+../../ietf/ietf-ip@2018-02-22.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm.yang b/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm.yang
deleted file mode 120000
index 4b2f85b..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-netconf-acm.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm@2018-02-14.yang b/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm@2018-02-14.yang
new file mode 120000
index 0000000..221907f
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-netconf-acm@2018-02-14.yang
@@ -0,0 +1 @@
+../../ietf/ietf-netconf-acm@2018-02-14.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-yang-types.yang b/data-model/yang/published/o-ran/ru-fh/ietf-yang-types.yang
deleted file mode 120000
index 90e4edf..0000000
--- a/data-model/yang/published/o-ran/ru-fh/ietf-yang-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../ietf/ietf-yang-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/ietf-yang-types@2013-07-15.yang b/data-model/yang/published/o-ran/ru-fh/ietf-yang-types@2013-07-15.yang
new file mode 120000
index 0000000..5e593df
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/ietf-yang-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../ietf/ietf-yang-types@2013-07-15.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/network-topology-simulator.yang b/data-model/yang/published/o-ran/ru-fh/network-topology-simulator.yang
new file mode 120000
index 0000000..6157e97
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/network-topology-simulator.yang
@@ -0,0 +1 @@
+../../../sim/nts-manager/network-topology-simulator.yang
\ No newline at end of file
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-ald-port.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-ald-port@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-ald-port.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-ald-port@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-ald.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-ald@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-ald.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-ald@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-beamforming.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-beamforming@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-beamforming.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-beamforming@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-delay-management.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-delay-management@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-delay-management.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-delay-management@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-dhcp.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-dhcp@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-dhcp.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-dhcp@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay@2019-02-04.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay@2019-02-04.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-externalio.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-externalio@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-externalio.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-externalio@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-fan.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-fan@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-fan.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-fan@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-file-management.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-file-management@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-file-management.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-file-management@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-fm.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-fm@2019-02-04.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-fm.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-fm@2019-02-04.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-03-28.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-03-28.yang
new file mode 100644
index 0000000..34cdada
--- /dev/null
+++ b/data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-03-28.yang
@@ -0,0 +1,271 @@
+module o-ran-hardware {
+  yang-version 1.1;
+  namespace "urn:o-ran:hardware:1.0";
+  prefix "o-ran-hw";
+
+  import ietf-hardware {
+    prefix hw;
+  }
+  import iana-hardware {
+    prefix ianahw;
+  }
+
+  organization "O-RAN Alliance";
+
+  contact
+    "www.o-ran.org";
+
+  description
+    "This module defines the YANG definitions for managng the O-RAN hardware.
+
+     Copyright 2019 the O-RAN Alliance.
+
+     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS'
+     AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+     IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+     ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+     LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+     INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+     POSSIBILITY OF SUCH DAMAGE.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are met:
+
+     * Redistributions of source code must retain the above copyright notice,
+     this list of conditions and the above disclaimer.
+     * Redistributions in binary form must reproduce the above copyright notice,
+     this list of conditions and the above disclaimer in the documentation
+     and/or other materials provided with the distribution.
+     * Neither the Members of the O-RAN Alliance nor the names of its
+     contributors may be used to endorse or promote products derived from
+     this software without specific prior written permission.";
+
+   revision "2019-03-28" {
+    description
+      "version 1.0.1
+
+      1) added new identities to accommodate cross working group use of
+      o-ran-hardware and assoicated set of augmentations that are backwards
+      compatible to version 1.0.0";
+
+    reference "ORAN-WG4.M.0-v01.00";
+   }
+
+  revision "2019-02-04" {
+   description
+     "version 1.0.0
+
+     1) imported model from xRAN
+     2) changed namespace and reference from xran to o-ran";
+
+   reference "ORAN-WG4.M.0-v01.00";
+  }
+
+  feature ENERGYSAVING {
+    description
+      "Indicates that the Radio Unit supports energy saving state.";
+  }
+
+  // identity statements
+  identity O-RAN-RADIO {
+    base ianahw:module;
+    description
+      "Module used as it represents a self-contained sub-system
+      used in /hw:/hardware/hw:component/hw:class to represent
+      an O-RAN RU";
+  }
+
+  identity O-RAN-HW-COMPONENT {
+    base ianahw:module;
+    description
+      "Module used as it represents a self-contained sub-system
+      used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN hardware component";
+  }
+
+  identity O-DU-COMPONENT {
+    base O-RAN-HW-COMPONENT;
+    description
+      "Used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN defined O-DU hardware component";
+  }
+
+  identity O-RU-COMPONENT {
+    base O-RAN-HW-COMPONENT;
+    description
+      "Used in /hw:/hardware/hw:component/hw:class to represent
+      any O-RAN defined O-RU hardware component, including a stand-alone
+      O-RU or an O-RU component integrated into a multi-module system.";
+  }
+
+  // typedef statements
+  typedef energysaving-state {
+    type enumeration {
+      enum UNKNOWN {
+        description "The Radio Unit is unable to report energy saving state.";
+      }
+      enum SLEEPING {
+        description
+          "The Radio Unit is in a sleep state. The NETCONF management plane
+           connection is functioning. Other functions and hardware which are
+           not needed for management plane may be in energy saving mode.";
+      }
+      enum AWAKE {
+        description
+          "The Radio Unit is not in an energy saving state.";
+      }
+    }
+    description
+      "new typedef since ietf-hardware only covers pwer-state
+      for redundancy purposes and not power saving operations.";
+  }
+
+  typedef availability-type {
+    type enumeration {
+      enum UNKNOWN {
+        description "The Radio Unit is unable to report its availability state.";
+      }
+      enum NORMAL {
+        description
+          "The equipment is functioning correctly.";
+      }
+      enum DEGRADED {
+        description
+          "The equipment may be reporting a major alarm or may be reporting a critical
+           alarm that is only impacting one or more subcomponent, but where the
+           equipment's implementation permit it to continue operation (server traffic)
+           in a degraded state.
+
+           Used for example, when the equipment has M identical sub-components and
+           when a critical alarm is imapcting only N subcomponents, where N<M.";
+      }
+      enum FAULTY {
+        description
+          "The (sub-)components impacted by the critical alarm(s) impact the
+          ability of the equipment to continue operation (serve traffic).";
+      }
+    }
+    description
+      "Equipment's availability-state is derived by matching active faults
+       and their impact to module's operation and enables an equipment to indicate
+       that even though it may have one or more critical alarms, it can continue
+       to serve traffic.";
+  }
+
+  // common WG4 and croos-WG augmentations using O-RAN-RADIO identity
+
+  augment "/hw:hardware/hw:component" {
+    when "(derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description "New O-RAN parameters for o-ran hardware";
+
+    container label-content {
+      config false;
+      description
+        "Which set of attributes are printed on the Radio Unit's label";
+      leaf model-name {
+        type boolean;
+        description
+          "indicates whether model-name is included on the equipment's label";
+      }
+      leaf serial-number {
+        type boolean;
+        description
+          "indicates whether serial number is included on the equipment's label";
+      }
+    }
+    leaf product-code {
+      type string;
+      config false;
+      mandatory true;
+      description
+        "O-RAN term that is distinct from model-name in ietf-hardware.";
+    }
+    leaf energy-saving-enabled {
+      if-feature "ENERGYSAVING";
+      type boolean;
+      config true;
+      default false;
+      description
+        "This parameter can enable O-RAN unit to be switched to energy
+         saving mode.
+         TRUE indicates to switch the energy saving mode.
+         FALSE indicates to cancel the energy saving mode.
+         At the energy saving mode, all power of whole O-RAN unit becomes
+         lowest level whereas M-plane is still available";
+    }
+  }
+
+  augment "/hw:hardware/hw:component" {
+    when "(derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(hw:class, 'ianahw:port')) or
+    (derived-from-or-self(hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description "New O-RAN parameters for o-ran naming";
+    leaf o-ran-name {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:name";
+      }
+      must "re-match(current(),'[a-zA-Z0-9][a-zA-Z0-9\\.\\-_]{0,253}[a-zA-Z0-9]')" {
+        error-message "Name must match pattern and length.";
+      }
+      mandatory true;
+      description
+        "O-RAN name needed to bind and match with the name of hw element,
+        to be compliant with O-RAN naming convention.";
+    }
+  }
+
+  augment "/hw:hardware/hw:component/hw:state"  {
+    when "(derived-from-or-self(../hw:class, 'o-ran-hw:O-RAN-RADIO')) or
+    (derived-from-or-self(../hw:class, 'o-ran-hw:O-RAN-HW-COMPONENT'))";
+    description
+      "new O-RAN defined state";
+    leaf power-state {
+      if-feature "ENERGYSAVING";
+      type energysaving-state;
+      config false;
+      description
+        "The current power saving state for this component.
+        Note - hw:/hardware/compnent/state/standby-state defined in RFC 4268 is
+        used for redundancy purposes and not power saving operations.";
+    }
+    leaf availability-state {
+      type availability-type;
+      config false;
+      description
+        "Equipment's availability-state is derived by matching active faults
+         and their impact to module's operation and enables an equipment to indicate
+         that even though it may have one or more critical alarms, it can continue
+         to serve traffic.";
+    }
+  }
+
+
+// augmentations to Notifications
+
+  augment "/hw:hardware-state-oper-enabled"  {
+    description "new availability state";
+    leaf availability-state {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:state/o-ran-hw:availability-state";
+      }
+      description
+        "The availability-state of the O-RU.";
+    }
+  }
+
+  augment "/hw:hardware-state-oper-disabled"  {
+    description "new availability state";
+    leaf availability-state {
+      type leafref {
+        path "/hw:hardware/hw:component/hw:state/o-ran-hw:availability-state";
+      }
+      description
+        "The availability-state of the O-RU.";
+    }
+  }
+}
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-hardware.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-hardware.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-interfaces.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-interfaces@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-interfaces.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-interfaces@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-laa.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-laa@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-laa.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-laa@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-lbm.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-lbm@2019-02-04.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-lbm.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-lbm@2019-02-04.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-module-cap.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-module-cap@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-module-cap.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-module-cap@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-operations.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-operations@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-operations.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-operations@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-performance-management.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-performance-management@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-performance-management.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-performance-management@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-processing-element.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-processing-element@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-processing-element.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-processing-element@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-software-management.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-software-management@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-software-management.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-software-management@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-supervision.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-supervision@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-supervision.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-supervision@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-sync.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-sync@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-sync.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-sync@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-trace.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-trace@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-trace.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-trace@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-transceiver.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-transceiver@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-transceiver.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-transceiver@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting@2019-02-04.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting@2019-02-04.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo@2019-02-04.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo@2019-02-04.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf@2019-07-03.yang
diff --git a/data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt.yang b/data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt@2019-07-03.yang
similarity index 100%
rename from data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt.yang
rename to data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt@2019-07-03.yang
diff --git a/data-model/yang/published/xran/iana-hardware.yang b/data-model/yang/published/xran/iana-hardware.yang
deleted file mode 120000
index b2d1ef3..0000000
--- a/data-model/yang/published/xran/iana-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/iana-hardware.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/iana-hardware@2018-03-13.yang b/data-model/yang/published/xran/iana-hardware@2018-03-13.yang
new file mode 120000
index 0000000..59610aa
--- /dev/null
+++ b/data-model/yang/published/xran/iana-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../ietf/iana-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/iana-if-type.yang b/data-model/yang/published/xran/iana-if-type.yang
deleted file mode 120000
index 2dd0a83..0000000
--- a/data-model/yang/published/xran/iana-if-type.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/iana-if-type.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/iana-if-type@2017-01-19.yang b/data-model/yang/published/xran/iana-if-type@2017-01-19.yang
new file mode 120000
index 0000000..c6249f0
--- /dev/null
+++ b/data-model/yang/published/xran/iana-if-type@2017-01-19.yang
@@ -0,0 +1 @@
+../ietf/iana-if-type@2017-01-19.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-dhcpv6-types.yang b/data-model/yang/published/xran/ietf-dhcpv6-types.yang
deleted file mode 120000
index cfa5b3c..0000000
--- a/data-model/yang/published/xran/ietf-dhcpv6-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-dhcpv6-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-dhcpv6-types@2018-01-30.yang b/data-model/yang/published/xran/ietf-dhcpv6-types@2018-01-30.yang
new file mode 120000
index 0000000..34cf4cf
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-dhcpv6-types@2018-01-30.yang
@@ -0,0 +1 @@
+../ietf/ietf-dhcpv6-types@2018-01-30.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-hardware.yang b/data-model/yang/published/xran/ietf-hardware.yang
deleted file mode 120000
index 9e0106e..0000000
--- a/data-model/yang/published/xran/ietf-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-hardware.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-hardware@2018-03-13.yang b/data-model/yang/published/xran/ietf-hardware@2018-03-13.yang
new file mode 120000
index 0000000..373ab11
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../ietf/ietf-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-inet-types.yang b/data-model/yang/published/xran/ietf-inet-types.yang
deleted file mode 120000
index 0f3f946..0000000
--- a/data-model/yang/published/xran/ietf-inet-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-inet-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-inet-types@2013-07-15.yang b/data-model/yang/published/xran/ietf-inet-types@2013-07-15.yang
new file mode 120000
index 0000000..d80a40d
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-inet-types@2013-07-15.yang
@@ -0,0 +1 @@
+../ietf/ietf-inet-types@2013-07-15.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-interfaces.yang b/data-model/yang/published/xran/ietf-interfaces.yang
deleted file mode 120000
index c514ec4..0000000
--- a/data-model/yang/published/xran/ietf-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-interfaces.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-interfaces@2018-02-20.yang b/data-model/yang/published/xran/ietf-interfaces@2018-02-20.yang
new file mode 120000
index 0000000..8bbccb3
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1 @@
+../ietf/ietf-interfaces@2018-02-20.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-ip.yang b/data-model/yang/published/xran/ietf-ip.yang
deleted file mode 120000
index fde2303..0000000
--- a/data-model/yang/published/xran/ietf-ip.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-ip.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-ip@2018-02-22.yang b/data-model/yang/published/xran/ietf-ip@2018-02-22.yang
new file mode 120000
index 0000000..785ecaf
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-ip@2018-02-22.yang
@@ -0,0 +1 @@
+../ietf/ietf-ip@2018-02-22.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-yang-types.yang b/data-model/yang/published/xran/ietf-yang-types.yang
deleted file mode 120000
index eb32011..0000000
--- a/data-model/yang/published/xran/ietf-yang-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../ietf/ietf-yang-types.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/ietf-yang-types@2013-07-15.yang b/data-model/yang/published/xran/ietf-yang-types@2013-07-15.yang
new file mode 120000
index 0000000..68f4f81
--- /dev/null
+++ b/data-model/yang/published/xran/ietf-yang-types@2013-07-15.yang
@@ -0,0 +1 @@
+../ietf/ietf-yang-types@2013-07-15.yang
\ No newline at end of file
diff --git a/data-model/yang/published/xran/xran-alarm-id.yang b/data-model/yang/published/xran/xran-alarm-id@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-alarm-id.yang
rename to data-model/yang/published/xran/xran-alarm-id@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-ald-port.yang b/data-model/yang/published/xran/xran-ald-port@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-ald-port.yang
rename to data-model/yang/published/xran/xran-ald-port@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-ald.yang b/data-model/yang/published/xran/xran-ald@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-ald.yang
rename to data-model/yang/published/xran/xran-ald@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-beamforming.yang b/data-model/yang/published/xran/xran-beamforming@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-beamforming.yang
rename to data-model/yang/published/xran/xran-beamforming@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-delay-management.yang b/data-model/yang/published/xran/xran-delay-management@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-delay-management.yang
rename to data-model/yang/published/xran/xran-delay-management@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-dhcp.yang b/data-model/yang/published/xran/xran-dhcp@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-dhcp.yang
rename to data-model/yang/published/xran/xran-dhcp@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-ecpri-delay.yang b/data-model/yang/published/xran/xran-ecpri-delay@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-ecpri-delay.yang
rename to data-model/yang/published/xran/xran-ecpri-delay@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-externalio.yang b/data-model/yang/published/xran/xran-externalio@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-externalio.yang
rename to data-model/yang/published/xran/xran-externalio@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-fan.yang b/data-model/yang/published/xran/xran-fan@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-fan.yang
rename to data-model/yang/published/xran/xran-fan@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-file-management.yang b/data-model/yang/published/xran/xran-file-management@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-file-management.yang
rename to data-model/yang/published/xran/xran-file-management@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-fm.yang b/data-model/yang/published/xran/xran-fm@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-fm.yang
rename to data-model/yang/published/xran/xran-fm@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-hardware.yang b/data-model/yang/published/xran/xran-hardware@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-hardware.yang
rename to data-model/yang/published/xran/xran-hardware@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-interfaces.yang b/data-model/yang/published/xran/xran-interfaces@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-interfaces.yang
rename to data-model/yang/published/xran/xran-interfaces@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-lbm.yang b/data-model/yang/published/xran/xran-lbm@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-lbm.yang
rename to data-model/yang/published/xran/xran-lbm@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-module-cap.yang b/data-model/yang/published/xran/xran-module-cap@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-module-cap.yang
rename to data-model/yang/published/xran/xran-module-cap@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-mplane-int.yang b/data-model/yang/published/xran/xran-mplane-int@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-mplane-int.yang
rename to data-model/yang/published/xran/xran-mplane-int@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-operations.yang b/data-model/yang/published/xran/xran-operations@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-operations.yang
rename to data-model/yang/published/xran/xran-operations@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-performance-management.yang b/data-model/yang/published/xran/xran-performance-management@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-performance-management.yang
rename to data-model/yang/published/xran/xran-performance-management@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-processing-element.yang b/data-model/yang/published/xran/xran-processing-element@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-processing-element.yang
rename to data-model/yang/published/xran/xran-processing-element@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-software-management.yang b/data-model/yang/published/xran/xran-software-management@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-software-management.yang
rename to data-model/yang/published/xran/xran-software-management@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-supervision.yang b/data-model/yang/published/xran/xran-supervision@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-supervision.yang
rename to data-model/yang/published/xran/xran-supervision@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-sync.yang b/data-model/yang/published/xran/xran-sync@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-sync.yang
rename to data-model/yang/published/xran/xran-sync@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-transceiver.yang b/data-model/yang/published/xran/xran-transceiver@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-transceiver.yang
rename to data-model/yang/published/xran/xran-transceiver@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-troubleshooting.yang b/data-model/yang/published/xran/xran-troubleshooting@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-troubleshooting.yang
rename to data-model/yang/published/xran/xran-troubleshooting@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-udp-echo.yang b/data-model/yang/published/xran/xran-udp-echo@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-udp-echo.yang
rename to data-model/yang/published/xran/xran-udp-echo@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-uplane-conf.yang b/data-model/yang/published/xran/xran-uplane-conf@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-uplane-conf.yang
rename to data-model/yang/published/xran/xran-uplane-conf@2018-07-20.yang
diff --git a/data-model/yang/published/xran/xran-usermgmt.yang b/data-model/yang/published/xran/xran-usermgmt@2018-07-20.yang
similarity index 100%
rename from data-model/yang/published/xran/xran-usermgmt.yang
rename to data-model/yang/published/xran/xran-usermgmt@2018-07-20.yang
diff --git a/data-model/yang/sim/nts-manager/network-topology-simulator.yang b/data-model/yang/sim/nts-manager/network-topology-simulator.yang
new file mode 100644
index 0000000..ac2cf8d
--- /dev/null
+++ b/data-model/yang/sim/nts-manager/network-topology-simulator.yang
@@ -0,0 +1,297 @@
+module network-topology-simulator {
+  yang-version 1.1;
+  namespace "urn:onf:params:xml:ns:yang:network-topology-simulator";
+  prefix network-topology-simulator;
+
+  import ietf-inet-types {
+    prefix inet;
+  }
+
+  organization
+    "Melacon";
+  contact
+    "Web: <https://github.com/Melacon>
+     Editors:  Alex Stancu
+               <mailto:stancu.liviualex@gmail.com>";
+  description
+    "This module contains a collection of YANG definitions for managing the Network Topology Simulator.";
+
+  revision 2019-10-25 {
+    description
+      "Modify notifications. Add VES message configuration options.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2019-06-07 {
+    description
+      "Modify controller details.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2019-03-07 {
+    description
+      "Initial version";
+    reference
+      "O-RAN SC SIM project";
+  }
+
+  typedef operational-state-type {
+    type enumeration {
+      enum not-specified {
+        description
+          "none";
+      }
+      enum running {
+        description
+          "none";
+      }
+      enum created {
+        description
+          "none";
+      }
+      enum exited {
+        description
+          "none";
+      }
+    }
+    description
+      "The operation state of the simulated device.";
+  }
+
+  typedef authentication-method-type {
+    type enumeration {
+      enum no-auth {
+        description
+          "no security (http)";
+      }
+      enum cert-only {
+        description
+          "auth by certificate (https)";
+      }
+      enum basic-auth {
+        description
+          "auth by basic auth username and password (https)";
+      }
+      enum cert-basic-auth {
+        description
+          "auth by certificate and basic auth username / password (https)";
+      }
+    }
+    description
+      "The authentication method for VES messaging.";
+  }
+
+  typedef percent {
+    type decimal64 {
+      fraction-digits 2;
+      range "0 .. 100";
+    }
+    description
+      "Percentage";
+  }
+
+  grouping controller-details-type-g {
+    leaf controller-ip {
+      type inet:ip-address;
+      description
+        "The IP Address of the SDN Controller.";
+    }
+    leaf controller-port {
+      type inet:port-number;
+      description
+        "The Port of the SDN Controller.";
+    }
+    leaf controller-username {
+      type string;
+      description
+        "The Username of the SDN Controller.";
+    }
+    leaf controller-password {
+      type string;
+      description
+        "The Password of the SDN Controller.";
+    }
+    description
+      "none";
+  }
+
+  grouping simulated-devices-type-g {
+    leaf uuid {
+      type string;
+      description
+        "The UUID of the simulated device.";
+    }
+    leaf device-ip {
+      type string;
+      description
+        "The IP Address of the simulated device.";
+    }
+    leaf-list device-port {
+      type uint32;
+      description
+        "A NETCONF endpoint (port) of the simulated device.";
+    }
+    leaf is-mounted {
+      type boolean;
+      description
+        "Specifies if the simulated device is mounted in the SDN Controller.";
+    }
+    leaf operational-state {
+      type operational-state-type;
+      description
+        "Specifies the operational state of the simulated device.";
+    }
+    description
+      "none";
+  }
+
+  container simulator-config {
+    description
+      "Configuration container of the simulator.";
+    leaf simulated-devices {
+      type uint32;
+      default "0";
+      description
+        "The number of devices to be simulated.";
+    }
+    leaf mounted-devices {
+      type uint32;
+      default "0";
+      description
+        "The number of devices to be mounted in ODL. The configured number should not exceed the number of mounted devices.";
+    }
+    container notification-config {
+      leaf fault-notification-delay-period {
+        type uint32;
+        default "0";
+        description
+          "Interval in seconds between two consecutive notifications. If the attribute is set to 0, nofitications are not generated.";
+      }
+      leaf ves-heartbeat-period {
+        type uint32;
+        default "0";
+        description
+          "Interval in seconds between two VES heartbeat messages. If the attribute is set to 0, heartbeat messages are not generated.";
+      }
+      leaf is-netconf-available {
+        type boolean;
+        default "true";
+        description
+          "If set to 'true', NETCONF notifications will be generated.";
+      }
+      leaf is-ves-available {
+        type boolean;
+        default "true";
+        description
+          "If set to 'true', VES messages will be generated.";
+      }
+      description
+        "none";
+    }
+    container controller-details {
+      uses controller-details-type-g;
+      description
+        "The connectivity details of the SDN Controller where we want to mount our simulated devices.";
+    }
+    container ves-endpoint-details {
+      must 'ves-registration = "false" or ../mounted-devices = 0' {
+        error-message "VES registration cannot be active while devices are still mounted to ODL not via VES.";
+      }
+      leaf ves-endpoint-ip {
+        type inet:ip-address;
+        description
+          "The IP Address of the VES Endpoint.";
+      }
+      leaf ves-endpoint-port {
+        type inet:port-number;
+        description
+          "The Port of the VES Endpoint.";
+      }
+      leaf ves-endpoint-auth-method {
+        type authentication-method-type;
+        default "no-auth";
+        description
+          "The type of the authentication to be used with the VES Endpoint.";
+      }
+      leaf ves-endpoint-username {
+        when "../ves-endpoint-auth-method = 'basic-auth' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Username to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-endpoint-password {
+        when "../ves-endpoint-auth-method = 'basic-auth' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Password to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-endpoint-certificate {
+        when "../ves-endpoint-auth-method = 'cert-only' or ../ves-endpoint-auth-method = 'cert-basic-auth'";
+        type string;
+        description
+          "The Certificate to be used to authenticate to the VES Endpoint.";
+      }
+      leaf ves-registration {
+        type boolean;
+        default "false";
+        description
+          "If this is set to 'True', the simulated devices will automatically send a pnfRegistration VES message when they start. This cannot be set to 'True' if we already have 'mounted-devices' greater that 0, because we already mounted the devices directly to ODL.";
+      }
+      description
+        "none";
+    }
+  }
+  container simulator-status {
+    config false;
+    container simulation-usage-details {
+      config false;
+      leaf running-simulated-devices {
+        type uint32;
+        description
+          "The current number of running simulated devices.";
+      }
+      leaf running-mounted-devices {
+        type uint32;
+        description
+          "The current number of running simulated devices that are mounted in ODL.";
+      }
+      leaf base-netconf-port {
+        type uint32;
+        default "30000";
+        description
+          "The starting port number for the NETCONF connections exposed.";
+      }
+      leaf cpu-usage {
+        type percent;
+        description
+          "Specifies the CPU load generated by this simulated device.";
+      }
+      leaf mem-usage {
+        type uint32;
+        description
+          "Specifies the RAM in MB used by this simulated device.";
+      }
+      description
+        "The details about the simulation, including resources consumed.";
+    }
+    list simulated-devices-list {
+      key "uuid";
+      config false;
+      uses simulated-devices-type-g;
+      description
+        "The list of the devices that are currently simulated.";
+    }
+    description
+      "State data container of the simulator.";
+  }
+
+  rpc restart-simulation {
+    description
+      "Operation to restart all the simulated devices with the new configuration of the simulator.";
+  }
+
+  rpc add-key-pair-to-odl {
+    description
+      "Operation to add a key pair signed by the NTS to OpenDaylight, such that it can connect to devices using TLS.";
+  }
+}
diff --git a/features/o-ran/ru-fh/src/main/yang/iana-hardware.yang b/features/o-ran/ru-fh/src/main/yang/iana-hardware.yang
deleted file mode 120000
index da775a1..0000000
--- a/features/o-ran/ru-fh/src/main/yang/iana-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/iana-hardware.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang b/features/o-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
new file mode 120000
index 0000000..b7bdb88
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/iana-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/iana-if-type.yang b/features/o-ran/ru-fh/src/main/yang/iana-if-type.yang
deleted file mode 120000
index 6cfafcd..0000000
--- a/features/o-ran/ru-fh/src/main/yang/iana-if-type.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/iana-if-type.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang b/features/o-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
new file mode 120000
index 0000000..8228918
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/iana-if-type@2017-01-19.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang b/features/o-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
new file mode 120000
index 0000000..6c9887a
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-alarms@2019-09-11.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types.yang b/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types.yang
deleted file mode 120000
index c60dd42..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-crypto-types.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types@2019-10-18.yang b/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types@2019-10-18.yang
new file mode 120000
index 0000000..509c254
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-crypto-types@2019-10-18.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-crypto-types@2019-10-18.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang b/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
deleted file mode 120000
index a37e196..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-dhcpv6-types.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang b/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
new file mode 120000
index 0000000..c99ae37
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-dhcpv6-types@2018-01-30.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-hardware.yang b/features/o-ran/ru-fh/src/main/yang/ietf-hardware.yang
deleted file mode 120000
index 8e34942..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-hardware.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang b/features/o-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
new file mode 120000
index 0000000..8738ff9
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-inet-types.yang b/features/o-ran/ru-fh/src/main/yang/ietf-inet-types.yang
deleted file mode 120000
index cb961a3..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-inet-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-inet-types.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang b/features/o-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
new file mode 120000
index 0000000..b0b41fb
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-inet-types@2013-07-15.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-interfaces.yang b/features/o-ran/ru-fh/src/main/yang/ietf-interfaces.yang
deleted file mode 120000
index b576ef6..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-interfaces.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang b/features/o-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
new file mode 120000
index 0000000..93ce75f
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-interfaces@2018-02-20.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-ip.yang b/features/o-ran/ru-fh/src/main/yang/ietf-ip.yang
deleted file mode 120000
index a303743..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-ip.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-ip.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang b/features/o-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
new file mode 120000
index 0000000..aeb410e
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-ip@2018-02-22.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm.yang b/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm.yang
deleted file mode 120000
index c4a1e7c..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-netconf-acm.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm@2018-02-14.yang b/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm@2018-02-14.yang
new file mode 120000
index 0000000..b42dafd
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-netconf-acm@2018-02-14.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-netconf-acm@2018-02-14.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-yang-types.yang b/features/o-ran/ru-fh/src/main/yang/ietf-yang-types.yang
deleted file mode 120000
index 831c9e7..0000000
--- a/features/o-ran/ru-fh/src/main/yang/ietf-yang-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/ietf/ietf-yang-types.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang b/features/o-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
new file mode 120000
index 0000000..13c8010
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-yang-types@2013-07-15.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port.yang
deleted file mode 120000
index 4c08092..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ald-port.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port@2019-07-03.yang
new file mode 120000
index 0000000..1ccfff5
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-ald-port@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ald-port@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ald.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ald.yang
deleted file mode 120000
index a606f37..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-ald.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ald.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ald@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ald@2019-07-03.yang
new file mode 120000
index 0000000..726abd7
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-ald@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ald@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration.yang
deleted file mode 120000
index 8364128..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration@2019-07-03.yang
new file mode 120000
index 0000000..601378a
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-antenna-calibration@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-antenna-calibration@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming.yang
deleted file mode 120000
index 34b5529..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-beamforming.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming@2019-07-03.yang
new file mode 120000
index 0000000..8303e94
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-beamforming@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-beamforming@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors.yang
deleted file mode 120000
index 60f5324..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors@2019-07-03.yang
new file mode 120000
index 0000000..f62cd4e
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-compression-factors@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-compression-factors@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management.yang
deleted file mode 120000
index 4345e09..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-delay-management.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management@2019-07-03.yang
new file mode 120000
index 0000000..8237853
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-delay-management@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-delay-management@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp.yang
deleted file mode 120000
index e8e9c88..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-dhcp.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp@2019-07-03.yang
new file mode 120000
index 0000000..1fe5c2d
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-dhcp@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-dhcp@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay.yang
deleted file mode 120000
index b2d4999..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay@2019-02-04.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay@2019-02-04.yang
new file mode 120000
index 0000000..41897d5
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-ecpri-delay@2019-02-04.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-ecpri-delay@2019-02-04.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-externalio.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-externalio.yang
deleted file mode 120000
index 858b037..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-externalio.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-externalio.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-externalio@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-externalio@2019-07-03.yang
new file mode 120000
index 0000000..844f8a8
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-externalio@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-externalio@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-fan.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-fan.yang
deleted file mode 120000
index e437370..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-fan.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-fan.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-fan@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-fan@2019-07-03.yang
new file mode 120000
index 0000000..b2151cb
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-fan@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-fan@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-file-management.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-file-management.yang
deleted file mode 120000
index 826ef8a..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-file-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-file-management.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-file-management@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-file-management@2019-07-03.yang
new file mode 120000
index 0000000..c600ca1
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-file-management@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-file-management@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-fm.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-fm.yang
deleted file mode 120000
index e2038ff..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-fm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-fm.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-fm@2019-02-04.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-fm@2019-02-04.yang
new file mode 120000
index 0000000..3dd318a
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-fm@2019-02-04.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-fm@2019-02-04.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-hardware.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-hardware.yang
deleted file mode 120000
index 0323b1d..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-hardware.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-hardware@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-hardware@2019-07-03.yang
new file mode 120000
index 0000000..5e0f091
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-hardware@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-hardware@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces.yang
deleted file mode 120000
index 3df6c78..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-interfaces.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces@2019-07-03.yang
new file mode 120000
index 0000000..d8e79b1
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-interfaces@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-interfaces@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations.yang
deleted file mode 120000
index 0c9a7c9..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations@2019-07-03.yang
new file mode 120000
index 0000000..175a1bc
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-laa-operations@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-laa-operations@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-laa.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-laa.yang
deleted file mode 120000
index 4088574..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-laa.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-laa.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-laa@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-laa@2019-07-03.yang
new file mode 120000
index 0000000..3eb54f2
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-laa@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-laa@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-lbm.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-lbm.yang
deleted file mode 120000
index 610d31d..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-lbm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-lbm.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-lbm@2019-02-04.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-lbm@2019-02-04.yang
new file mode 120000
index 0000000..cd7992c
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-lbm@2019-02-04.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-lbm@2019-02-04.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap.yang
deleted file mode 120000
index 20c92a9..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-module-cap.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap@2019-07-03.yang
new file mode 120000
index 0000000..47e8f6a
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-module-cap@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-module-cap@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int.yang
deleted file mode 120000
index 5853fe3..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int@2019-07-03.yang
new file mode 120000
index 0000000..22a3a82
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-mplane-int@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-mplane-int@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-operations.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-operations.yang
deleted file mode 120000
index 31d67ad..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-operations.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-operations.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-operations@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-operations@2019-07-03.yang
new file mode 120000
index 0000000..2eab7a1
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-operations@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-operations@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management.yang
deleted file mode 120000
index d5b875c..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-performance-management.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management@2019-07-03.yang
new file mode 120000
index 0000000..4058eb5
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-performance-management@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-performance-management@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element.yang
deleted file mode 120000
index fc76ffd..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-processing-element.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element@2019-07-03.yang
new file mode 120000
index 0000000..ced003d
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-processing-element@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-processing-element@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-software-management.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-software-management.yang
deleted file mode 120000
index 4d8c127..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-software-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-software-management.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-software-management@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-software-management@2019-07-03.yang
new file mode 120000
index 0000000..758efc1
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-software-management@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-software-management@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-supervision.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-supervision.yang
deleted file mode 120000
index 0a0be68..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-supervision.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-supervision.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-supervision@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-supervision@2019-07-03.yang
new file mode 120000
index 0000000..a7297c7
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-supervision@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-supervision@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-sync.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-sync.yang
deleted file mode 120000
index 6e9b013..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-sync.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-sync.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-sync@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-sync@2019-07-03.yang
new file mode 120000
index 0000000..33078d2
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-sync@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-sync@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-trace.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-trace.yang
deleted file mode 120000
index 36a0a9c..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-trace.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-trace.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-trace@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-trace@2019-07-03.yang
new file mode 120000
index 0000000..fd04b07
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-trace@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-trace@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver.yang
deleted file mode 120000
index 1ea31e1..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-transceiver.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver@2019-07-03.yang
new file mode 120000
index 0000000..d6f9464
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-transceiver@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-transceiver@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting.yang
deleted file mode 120000
index 3790bb0..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting@2019-02-04.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting@2019-02-04.yang
new file mode 120000
index 0000000..d7fe35c
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-troubleshooting@2019-02-04.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-troubleshooting@2019-02-04.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo.yang
deleted file mode 120000
index 59c3106..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo@2019-02-04.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo@2019-02-04.yang
new file mode 120000
index 0000000..542f33b
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-udp-echo@2019-02-04.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-udp-echo@2019-02-04.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf.yang
deleted file mode 120000
index d218554..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf@2019-07-03.yang
new file mode 120000
index 0000000..e830691
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-uplane-conf@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-uplane-conf@2019-07-03.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt.yang
deleted file mode 120000
index 8c4d7fc..0000000
--- a/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt.yang
\ No newline at end of file
diff --git a/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt@2019-07-03.yang b/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt@2019-07-03.yang
new file mode 120000
index 0000000..88a45ef
--- /dev/null
+++ b/features/o-ran/ru-fh/src/main/yang/o-ran-usermgmt@2019-07-03.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/o-ran/ru-fh/o-ran-usermgmt@2019-07-03.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/iana-hardware.yang b/features/x-ran/ru-fh/src/main/yang/iana-hardware.yang
deleted file mode 120000
index 89857ba..0000000
--- a/features/x-ran/ru-fh/src/main/yang/iana-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/iana-hardware.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang b/features/x-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
new file mode 120000
index 0000000..b7bdb88
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/iana-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/iana-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/iana-if-type.yang b/features/x-ran/ru-fh/src/main/yang/iana-if-type.yang
deleted file mode 120000
index 0463247..0000000
--- a/features/x-ran/ru-fh/src/main/yang/iana-if-type.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/iana-if-type.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang b/features/x-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
new file mode 120000
index 0000000..8228918
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/iana-if-type@2017-01-19.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/iana-if-type@2017-01-19.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang b/features/x-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
new file mode 120000
index 0000000..6c9887a
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-alarms@2019-09-11.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-alarms@2019-09-11.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang b/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
deleted file mode 120000
index cb69e96..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-dhcpv6-types.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang b/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
new file mode 120000
index 0000000..c99ae37
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-dhcpv6-types@2018-01-30.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-dhcpv6-types@2018-01-30.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-hardware.yang b/features/x-ran/ru-fh/src/main/yang/ietf-hardware.yang
deleted file mode 120000
index a718b2c..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-hardware.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang b/features/x-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
new file mode 120000
index 0000000..8738ff9
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-hardware@2018-03-13.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-hardware@2018-03-13.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-inet-types.yang b/features/x-ran/ru-fh/src/main/yang/ietf-inet-types.yang
deleted file mode 120000
index 2fdd125..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-inet-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-inet-types.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang b/features/x-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
new file mode 120000
index 0000000..b0b41fb
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-inet-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-inet-types@2013-07-15.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-interfaces.yang b/features/x-ran/ru-fh/src/main/yang/ietf-interfaces.yang
deleted file mode 120000
index 6c774e8..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-interfaces.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang b/features/x-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
new file mode 120000
index 0000000..93ce75f
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-interfaces@2018-02-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-interfaces@2018-02-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-ip.yang b/features/x-ran/ru-fh/src/main/yang/ietf-ip.yang
deleted file mode 120000
index 1299091..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-ip.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-ip.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang b/features/x-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
new file mode 120000
index 0000000..aeb410e
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-ip@2018-02-22.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-ip@2018-02-22.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-yang-types.yang b/features/x-ran/ru-fh/src/main/yang/ietf-yang-types.yang
deleted file mode 120000
index 91fd2bf..0000000
--- a/features/x-ran/ru-fh/src/main/yang/ietf-yang-types.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/ietf-yang-types.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang b/features/x-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
new file mode 120000
index 0000000..13c8010
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/ietf-yang-types@2013-07-15.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/ietf/ietf-yang-types@2013-07-15.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-alarm-id.yang b/features/x-ran/ru-fh/src/main/yang/xran-alarm-id.yang
deleted file mode 120000
index 4d63773..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-alarm-id.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-alarm-id.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-alarm-id@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-alarm-id@2018-07-20.yang
new file mode 120000
index 0000000..e9a8aca
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-alarm-id@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-alarm-id@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ald-port.yang b/features/x-ran/ru-fh/src/main/yang/xran-ald-port.yang
deleted file mode 120000
index a23f06c..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-ald-port.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-ald-port.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ald-port@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-ald-port@2018-07-20.yang
new file mode 120000
index 0000000..d451282
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-ald-port@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-ald-port@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ald.yang b/features/x-ran/ru-fh/src/main/yang/xran-ald.yang
deleted file mode 120000
index a955391..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-ald.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-ald.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ald@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-ald@2018-07-20.yang
new file mode 120000
index 0000000..dfa332f
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-ald@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-ald@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-beamforming.yang b/features/x-ran/ru-fh/src/main/yang/xran-beamforming.yang
deleted file mode 120000
index 32e5764..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-beamforming.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-beamforming.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-beamforming@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-beamforming@2018-07-20.yang
new file mode 120000
index 0000000..ae5c5ef
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-beamforming@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-beamforming@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-delay-management.yang b/features/x-ran/ru-fh/src/main/yang/xran-delay-management.yang
deleted file mode 120000
index 37a2701..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-delay-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-delay-management.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-delay-management@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-delay-management@2018-07-20.yang
new file mode 120000
index 0000000..e3a5595
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-delay-management@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-delay-management@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-dhcp.yang b/features/x-ran/ru-fh/src/main/yang/xran-dhcp.yang
deleted file mode 120000
index de56033..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-dhcp.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-dhcp.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-dhcp@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-dhcp@2018-07-20.yang
new file mode 120000
index 0000000..932cef5
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-dhcp@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-dhcp@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay.yang b/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay.yang
deleted file mode 120000
index 72545f5..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-ecpri-delay.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay@2018-07-20.yang
new file mode 120000
index 0000000..3e78e74
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-ecpri-delay@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-ecpri-delay@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-externalio.yang b/features/x-ran/ru-fh/src/main/yang/xran-externalio.yang
deleted file mode 120000
index caa007d..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-externalio.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-externalio.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-externalio@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-externalio@2018-07-20.yang
new file mode 120000
index 0000000..d6a9078
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-externalio@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-externalio@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-fan.yang b/features/x-ran/ru-fh/src/main/yang/xran-fan.yang
deleted file mode 120000
index 8c28da9..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-fan.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-fan.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-fan@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-fan@2018-07-20.yang
new file mode 120000
index 0000000..3a7d563
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-fan@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-fan@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-file-management.yang b/features/x-ran/ru-fh/src/main/yang/xran-file-management.yang
deleted file mode 120000
index 333eab7..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-file-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-file-management.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-file-management@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-file-management@2018-07-20.yang
new file mode 120000
index 0000000..8c29592
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-file-management@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-file-management@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-fm.yang b/features/x-ran/ru-fh/src/main/yang/xran-fm.yang
deleted file mode 120000
index 4e41a3c..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-fm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-fm.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-fm@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-fm@2018-07-20.yang
new file mode 120000
index 0000000..54f4286
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-fm@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-fm@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-hardware.yang b/features/x-ran/ru-fh/src/main/yang/xran-hardware.yang
deleted file mode 120000
index ac7e1b6..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-hardware.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-hardware.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-hardware@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-hardware@2018-07-20.yang
new file mode 120000
index 0000000..cfb79a0
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-hardware@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-hardware@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-interfaces.yang b/features/x-ran/ru-fh/src/main/yang/xran-interfaces.yang
deleted file mode 120000
index 91b089e..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-interfaces.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-interfaces.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-interfaces@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-interfaces@2018-07-20.yang
new file mode 120000
index 0000000..bfd013f
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-interfaces@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-interfaces@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-lbm.yang b/features/x-ran/ru-fh/src/main/yang/xran-lbm.yang
deleted file mode 120000
index fc308bf..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-lbm.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-lbm.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-lbm@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-lbm@2018-07-20.yang
new file mode 120000
index 0000000..f3843b8
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-lbm@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-lbm@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-module-cap.yang b/features/x-ran/ru-fh/src/main/yang/xran-module-cap.yang
deleted file mode 120000
index 204d746..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-module-cap.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-module-cap.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-module-cap@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-module-cap@2018-07-20.yang
new file mode 120000
index 0000000..2e248c0
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-module-cap@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-module-cap@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-mplane-int.yang b/features/x-ran/ru-fh/src/main/yang/xran-mplane-int.yang
deleted file mode 120000
index 1c81b8b..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-mplane-int.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-mplane-int.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-mplane-int@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-mplane-int@2018-07-20.yang
new file mode 120000
index 0000000..74c3179
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-mplane-int@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-mplane-int@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-operations.yang b/features/x-ran/ru-fh/src/main/yang/xran-operations.yang
deleted file mode 120000
index 60f6720..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-operations.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-operations.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-operations@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-operations@2018-07-20.yang
new file mode 120000
index 0000000..237ca81
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-operations@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-operations@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-performance-management.yang b/features/x-ran/ru-fh/src/main/yang/xran-performance-management.yang
deleted file mode 120000
index 3918012..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-performance-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-performance-management.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-performance-management@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-performance-management@2018-07-20.yang
new file mode 120000
index 0000000..e4a39c6
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-performance-management@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-performance-management@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-processing-element.yang b/features/x-ran/ru-fh/src/main/yang/xran-processing-element.yang
deleted file mode 120000
index 2e044f6..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-processing-element.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-processing-element.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-processing-element@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-processing-element@2018-07-20.yang
new file mode 120000
index 0000000..6cf5e14
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-processing-element@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-processing-element@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-software-management.yang b/features/x-ran/ru-fh/src/main/yang/xran-software-management.yang
deleted file mode 120000
index 6fbb481..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-software-management.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-software-management.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-software-management@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-software-management@2018-07-20.yang
new file mode 120000
index 0000000..f8e09fc
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-software-management@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-software-management@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-supervision.yang b/features/x-ran/ru-fh/src/main/yang/xran-supervision.yang
deleted file mode 120000
index 51f7361..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-supervision.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-supervision.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-supervision@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-supervision@2018-07-20.yang
new file mode 120000
index 0000000..1732683
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-supervision@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-supervision@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-sync.yang b/features/x-ran/ru-fh/src/main/yang/xran-sync.yang
deleted file mode 120000
index 4c1774c..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-sync.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-sync.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-sync@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-sync@2018-07-20.yang
new file mode 120000
index 0000000..cc195a8
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-sync@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-sync@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-transceiver.yang b/features/x-ran/ru-fh/src/main/yang/xran-transceiver.yang
deleted file mode 120000
index 7c0f110..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-transceiver.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-transceiver.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-transceiver@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-transceiver@2018-07-20.yang
new file mode 120000
index 0000000..27ff37d
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-transceiver@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-transceiver@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting.yang b/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting.yang
deleted file mode 120000
index 9047027..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-troubleshooting.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting@2018-07-20.yang
new file mode 120000
index 0000000..1993b68
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-troubleshooting@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-troubleshooting@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-udp-echo.yang b/features/x-ran/ru-fh/src/main/yang/xran-udp-echo.yang
deleted file mode 120000
index 9f565cf..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-udp-echo.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-udp-echo.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-udp-echo@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-udp-echo@2018-07-20.yang
new file mode 120000
index 0000000..75cbd9a
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-udp-echo@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-udp-echo@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf.yang b/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf.yang
deleted file mode 120000
index 6d8a051..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-uplane-conf.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf@2018-07-20.yang
new file mode 120000
index 0000000..16fe1a7
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-uplane-conf@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-uplane-conf@2018-07-20.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-usermgmt.yang b/features/x-ran/ru-fh/src/main/yang/xran-usermgmt.yang
deleted file mode 120000
index f9d9030..0000000
--- a/features/x-ran/ru-fh/src/main/yang/xran-usermgmt.yang
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../data-model/yang/published/xran/xran-usermgmt.yang
\ No newline at end of file
diff --git a/features/x-ran/ru-fh/src/main/yang/xran-usermgmt@2018-07-20.yang b/features/x-ran/ru-fh/src/main/yang/xran-usermgmt@2018-07-20.yang
new file mode 120000
index 0000000..aa43075
--- /dev/null
+++ b/features/x-ran/ru-fh/src/main/yang/xran-usermgmt@2018-07-20.yang
@@ -0,0 +1 @@
+../../../../../../data-model/yang/published/xran/xran-usermgmt@2018-07-20.yang
\ No newline at end of file
-- 
2.16.6