Rewrite NTS Framework.

[sim/o1-interface.git] / ntsimulator / deploy / o-ran / yang / o-ran-operations.yang

diff --git a/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang b/ntsimulator/deploy/o-ran/yang/o-ran-operations.yang
similarity index 94%
rename from ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang
rename to ntsimulator/deploy/o-ran/yang/o-ran-operations.yang
index 0623202..fbea809 100644 (file)
--- a/ntsimulator/yang/o-ran/ru-fh/o-ran-operations.yang
+++ b/ntsimulator/deploy/o-ran/yang/o-ran-operations.yang
@@ -111,14 +111,9 @@ module o-ran-operations {
 
       leaf ru-instance-id {
         type string;
-       // [ast] added extra concat, because only 3 params are accepted in NTS
-       // must "re-match(current(), concat(/hw:hardware/hw:component/hw:mfg-name,
-        //  '_', /hw:hardware/hw:component/hw:model-name, '_',
-        //  /hw:hardware/hw:component/hw:serial-num ))";
-        must "re-match(current(), concat(concat(/hw:hardware/hw:component/hw:mfg-name,
-          '_', /hw:hardware/hw:component/hw:model-name), '_',
-          /hw:hardware/hw:component/hw:serial-num))";
-       // [ast] end fix
+        must "re-match(current(), concat(/hw:hardware/hw:component/hw:mfg-name,
+            '_', /hw:hardware/hw:component/hw:model-name, '_',
+            /hw:hardware/hw:component/hw:serial-num ))";
         description
           "a unique instance identifier that may be used to identify a
           particular hardware instance, e.g., when used performing hierarchical