X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fyang%2Fnts-manager%2Fnetwork-topology-simulator.yang;h=766a3efb4541c327fe684b316ec85b7d15a9107d;hb=7dbf479029ba8bc528fb61a40ab2647489da28e9;hp=ac2cf8dd38ca55aa4ca241912bee3f7fc0fc1bc3;hpb=1f1479ff8ce3a268acb7b70a32bb789d859a915b;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/yang/nts-manager/network-topology-simulator.yang b/ntsimulator/yang/nts-manager/network-topology-simulator.yang
index ac2cf8d..766a3ef 100644
--- a/ntsimulator/yang/nts-manager/network-topology-simulator.yang
+++ b/ntsimulator/yang/nts-manager/network-topology-simulator.yang
@@ -16,6 +16,24 @@ module network-topology-simulator {
   description
     "This module contains a collection of YANG definitions for managing the Network Topology Simulator.";
 
+  revision 2020-04-22 {
+    description
+      "Add configuration for number of SSH and TLS connections exposed by each simulated device.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2020-04-13 {
+    description
+      "Change fault-notification-delay-period to leaf-list.";
+    reference
+      "O-RAN SC SIM project";
+  }
+  revision 2020-04-10 {
+    description
+      "Add notification count in status.";
+    reference
+      "O-RAN SC SIM project";
+  }
   revision 2019-10-25 {
     description
       "Modify notifications. Add VES message configuration options.";
@@ -145,7 +163,41 @@ module network-topology-simulator {
       "none";
   }
 
+  grouping notification-count-per-severity-g {
+    leaf normal {
+    type uint32;
+    description
+    "The number of normal notifications.";
+    }
+    leaf warning {
+    type uint32;
+    description
+    "The number of warning notifications.";
+    }
+    leaf minor {
+    type uint32;
+    description
+    "The number of minor notifications.";
+    }
+    leaf major {
+    type uint32;
+    description
+    "The number of major notifications.";
+    }
+    leaf critical {
+    type uint32;
+    description
+    "The number of normal notifications.";
+    }
+    description
+      "none";
+  }
+
   container simulator-config {
+    must "./ssh-connections + ./tls-connections <= 100" {
+      error-message "The total number of connections (SSH + TLS) needs to be less than or equal with 100.";
+    }
+    // presence "Enables NTS configuration.";
     description
       "Configuration container of the simulator.";
     leaf simulated-devices {
@@ -156,16 +208,35 @@ module network-topology-simulator {
     }
     leaf mounted-devices {
       type uint32;
+      must ". <= ../simulated-devices" {
+          error-message "The number of mounted devices cannot be greater that the number of simulated devices";
+      }
       default "0";
       description
         "The number of devices to be mounted in ODL. The configured number should not exceed the number of mounted devices.";
     }
+    leaf ssh-connections {
+      when "../simulated-devices = 0";
+      type uint32;
+      default "1";
+      description
+        "The number of SSH connections to be exposed by each simulated device.";
+    }
+    leaf tls-connections {
+    when "../simulated-devices = 0";
+      type uint32;
+      default "0";
+      description
+        "The number of TLS connections to be exposed by each simulated device.";
+    }
     container notification-config {
-      leaf fault-notification-delay-period {
+      leaf-list fault-notification-delay-period {
         type uint32;
-        default "0";
+        min-elements 1;
+        max-elements 99;
         description
-          "Interval in seconds between two consecutive notifications. If the attribute is set to 0, nofitications are not generated.";
+          "Defines a pattern of generating notifications, represented by the amount of time between two generated fault notifications. The pattern is circular, it restarts at the beginning after all the leaf-list items are being used.
+          E.g.: if the leaf-list contains three items: 4, 8 and 10, then a fault-notification will be generated, then after 4 seconds a new notification will be generaed, then after 8 seconds, then after 10 seconds, then again after 4 seconds etc.";
       }
       leaf ves-heartbeat-period {
         type uint32;
@@ -274,10 +345,46 @@ module network-topology-simulator {
       description
         "The details about the simulation, including resources consumed.";
     }
+    container notification-count {
+        config false;
+        container total-ves-notifications {
+            config false;
+            uses  notification-count-per-severity-g;
+            description
+              "The total number of VES notifications that were sent by all the simulated devices managed by this NTS Manager instance.";
+        }
+        container total-netconf-notifications {
+            config false;
+            uses  notification-count-per-severity-g;
+            description
+              "The total number of NETCONF notifications that were sent by all the simulated devices managed by this NTS Manager instance.";
+        }
+        description 
+          "The total number of notifications sent by the devices managed by this NTS Manager instance.";
+        
+    }
     list simulated-devices-list {
       key "uuid";
       config false;
       uses simulated-devices-type-g;
+      container notification-count {
+        config false;
+        container ves-notifications {
+            config false;
+            uses  notification-count-per-severity-g;
+            description
+              "The total number of VES notifications that were sent by this simulated device.";
+        }
+        container netconf-notifications {
+            config false;
+            uses  notification-count-per-severity-g;
+            description
+              "The total number of NETCONF notifications that were sent by this simulated device.";
+        }
+        description 
+          "The total number of notifications sent by this simulated device.";
+        
+    }
       description
         "The list of the devices that are currently simulated.";
     }