X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?p=sim%2Fo1-interface.git;a=blobdiff_plain;f=ntsimulator%2Fdeploy%2Fo-ran%2Fyang%2Fo-ran-operations.yang;fp=ntsimulator%2Fyang%2Fo-ran%2Fru-fh%2Fo-ran-operations.yang;h=fbea8092c5215767195e6c8c8118841ca9a28aff;hp=0623202c4eeedf66480edf94b42bb0f4ff79e35a;hb=f1d5c9198acde7a7ce296490087cad37e008f688;hpb=f2d8f1002fa93848c80a88e5658db4816cba3020

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
--- 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