From: Maxim Mamontov <faust.madf@gmail.com>
Date: Thu, 1 Sep 2011 13:52:00 +0000 (+0300)
Subject: Move tariffUsers from users section to tariffs.tariffUsage and fix
X-Git-Tag: 2.408-alpha~1
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/359069a6176ea572082868bd3a5420143b9b746c?hp=58024dfd7ad59626cc0c4beaf82f5c27c93ea0e3

Move tariffUsers from users section to tariffs.tariffUsage and fix
lintian errors
---

diff --git a/projects/stargazer/plugins/other/smux/STG-MIB.mib b/projects/stargazer/plugins/other/smux/STG-MIB.mib
index 22fb103b..8eaffb3d 100644
--- a/projects/stargazer/plugins/other/smux/STG-MIB.mib
+++ b/projects/stargazer/plugins/other/smux/STG-MIB.mib
@@ -3,9 +3,8 @@ STG-MIB DEFINITIONS ::= BEGIN
 IMPORTS
     enterprises,
     MODULE-IDENTITY, OBJECT-TYPE,
-    Integer32,
-    NOTIFICATION-TYPE               FROM SNMPv2-SMI
-    DisplayString                   FROM RFC1213-MIB;
+    Integer32                       FROM SNMPv2-SMI
+    DisplayString                   FROM SNMPv2-TC;
 
 stgMIB MODULE-IDENTITY
     LAST-UPDATED "201101060000Z"
@@ -19,14 +18,14 @@ stgMIB MODULE-IDENTITY
     DESCRIPTION "Initial revision"
     ::= { enterprises 38313 }
 
-stg-24 OBJECT IDENTIFIER ::= { stgMIB 1 }
+stg24 OBJECT IDENTIFIER ::= { stgMIB 1 }
 
-users OBJECT IDENTIFIER ::= { stg-24 1 }
-tariffs OBJECT IDENTIFIER ::= { stg-24 2 }
-admins OBJECT IDENTIFIER ::= { stg-24 3 }
-services OBJECT IDENTIFIER ::= { stg-24 4 }
-corporations OBJECT IDENTIFIER ::= { stg-24 5 }
-traffcounter OBJECT IDENTIFIER ::= { stg-24 6 }
+users OBJECT IDENTIFIER ::= { stg24 1 }
+tariffs OBJECT IDENTIFIER ::= { stg24 2 }
+admins OBJECT IDENTIFIER ::= { stg24 3 }
+services OBJECT IDENTIFIER ::= { stg24 4 }
+corporations OBJECT IDENTIFIER ::= { stg24 5 }
+traffcounter OBJECT IDENTIFIER ::= { stg24 6 }
 
 totalUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -73,54 +72,6 @@ noCashUsers OBJECT-TYPE
     DEFVAL { 0 }
     ::= { users 5 }
 
-tariffUsers OBJECT-TYPE
-    SYNTAX      SEQUENCE OF UsersByTariff
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-	"The number of users by each tariff"
-    DEFVAL { 0 }
-    ::= { users 6 }
-
-usersByTariff OBJECT-TYPE
-    SYNTAX      UsersByTariff
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "A row describing a given tariff"
-    INDEX   { tariffIndex }
-    ::= {tariffUsers 1 }
-
-UsersByTariff ::= SEQUENCE {
-    tariffIndex Integer32,
-    tariffName DisplayString,
-    userCount Integer32
-}
-
-tariffIndex OBJECT-TYPE
-    SYNTAX      Integer32 (0..255)
-    MAX-ACCESS  not-accessible
-    STATUS      current
-    DESCRIPTION
-        "The id of the tariff this table describes."
-    ::= { usersByTariff 1 }
-
-tariffName OBJECT-TYPE
-    SYNTAX      DisplayString
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The name of the tariff this table describes."
-    ::= { usersByTariff 2 }
-
-userCount OBJECT-TYPE
-    SYNTAX      Integer32
-    MAX-ACCESS  read-only
-    STATUS      current
-    DESCRIPTION
-        "The count fo users of the tariff this table describes."
-    ::= { usersByTariff 3 }
-
 disabledDetailStatsUsers OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only
@@ -128,7 +79,7 @@ disabledDetailStatsUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of users with disabled detail stats"
     DEFVAL { 0 }
-    ::= { users 7 }
+    ::= { users 6 }
 
 disabledUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -137,7 +88,7 @@ disabledUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of disabled users"
     DEFVAL { 0 }
-    ::= { users 8 }
+    ::= { users 7 }
 
 passiveUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -146,7 +97,7 @@ passiveUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of passive users"
     DEFVAL { 0 }
-    ::= { users 9 }
+    ::= { users 8 }
 
 creditUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -155,7 +106,7 @@ creditUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of users with positive credit"
     DEFVAL { 0 }
-    ::= { users 10 }
+    ::= { users 9 }
 
 freeMbUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -164,7 +115,7 @@ freeMbUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of users with positive freeMb"
     DEFVAL { 0 }
-    ::= { users 11 }
+    ::= { users 10 }
 
 tariffChangeUsers OBJECT-TYPE
     SYNTAX      Integer32
@@ -173,7 +124,7 @@ tariffChangeUsers OBJECT-TYPE
     DESCRIPTION
 	"The number of users changing tariff next month"
     DEFVAL { 0 }
-    ::= { users 12 }
+    ::= { users 11 }
 
 totalTariffs OBJECT-TYPE
     SYNTAX      Integer32
@@ -184,6 +135,54 @@ totalTariffs OBJECT-TYPE
     DEFVAL { 0 }
     ::= { tariffs 1 }
 
+tariffUsageTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF TariffUsageTable
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+	"The number of users by each tariff"
+    DEFVAL { 0 }
+    ::= { tariffs 2 }
+
+tariffUsageTableEntry OBJECT-TYPE
+    SYNTAX      TariffUsageTable
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "A row describing a given tariff"
+    INDEX   { tariffIndex }
+    ::= {tariffUsageTable 1 }
+
+TariffUsageTable ::= SEQUENCE {
+    tariffIndex Integer32,
+    tariffName DisplayString,
+    userCount Integer32
+}
+
+tariffIndex OBJECT-TYPE
+    SYNTAX      Integer32 (0..255)
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "The id of the tariff this table describes."
+    ::= { tariffUsageTableEntry 1 }
+
+tariffName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The name of the tariff this table describes."
+    ::= { tariffUsageTableEntry 2 }
+
+userCount OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The count fo users of the tariff this table describes."
+    ::= { tariffUsageTableEntry 3 }
+
 totalAdmins OBJECT-TYPE
     SYNTAX      Integer32
     MAX-ACCESS  read-only