From e7c59dbd575ecdbb998830621e4c9a69e886496b Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Wed, 3 Feb 2016 16:01:31 -0600
Subject: [PATCH 1/6] Initial Calix E7 Support

---
 includes/definitions.inc.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 07550b2e3..0b3d08490 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -311,6 +311,16 @@ $config['os'][$os]['icon']             = 'barracuda';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Traffic';
 
+// Calix
+$os = 'calix';
+$config['os'][$os]['text']             = 'Calix E7';
+$config['os'][$os]['type']             = 'network';
+$config['os'][$os]['icon']             = 'calix';
+$config['os'][$os]['over'][0]['graph'] = 'device_bits';
+$config['os'][$os]['over'][0]['text']  = 'Device Traffic';
+$config['os'][$os]['over'][1]['graph'] = 'device_processor';
+$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
+
 // Cisco OSes
 $os = 'ios';
 $config['os'][$os]['group']            = 'cisco';

From 4aa9838eda55a29180ae90d7929502dd7529454b Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 5 Feb 2016 14:26:06 -0600
Subject: [PATCH 2/6] add discover, polling and mibs. work around empty ifDesc

---
 html/images/os/calix.png            |  Bin 0 -> 838 bytes
 includes/discovery/os/calix.inc.php |    6 +
 includes/functions.php              |    2 +-
 includes/polling/os/calix.inc.php   |    4 +
 mibs/CALIX-PRODUCT-MIB.my           |  291 ++++++
 mibs/CALIX-SMI.my                   |   78 ++
 mibs/E7-Calix-MIB                   | 1361 +++++++++++++++++++++++++++
 mibs/E7-TC.my                       |  689 ++++++++++++++
 8 files changed, 2430 insertions(+), 1 deletion(-)
 create mode 100644 html/images/os/calix.png
 create mode 100644 includes/discovery/os/calix.inc.php
 create mode 100644 includes/polling/os/calix.inc.php
 create mode 100644 mibs/CALIX-PRODUCT-MIB.my
 create mode 100644 mibs/CALIX-SMI.my
 create mode 100644 mibs/E7-Calix-MIB
 create mode 100644 mibs/E7-TC.my

diff --git a/html/images/os/calix.png b/html/images/os/calix.png
new file mode 100644
index 0000000000000000000000000000000000000000..156c0f8530b5b085ecdabee445aba51fbb22aefc
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY7ZLyf7ZL$ypVCqQ000McNliru-~s~_I3{dZe+B>m0@F!E
zK~z}7)z?jETvZeY@L$ppv{Wp$=wMMxRm38M3O=lYDeYV6BBFMq_<=|i7gdW$1;g8T
znT2*Ch~UDHD7ex^3%U^dz#0fNccWcY!OBR%)NJ}ep`;Y*xVeRCI=*=`84=IwaXI(>
z|L5HE$$u;({a(nkVlyVO6*uA(TKJ)i;n=@IAkT^kJcSprp+fZ%KE`Yr!@{Zw<XJI}
z@30-?eHeBLzu}QGhTp3cM=QXez;bf;c%PnKgS*hmv*P8xJ&<R`e!MZnSo;*yWen|}
z9!QLb34RtIb_2i411Z>k8Z!9SGKN2U#z3AG>+tOm!O!5KDsUL<_<j<N8b5C1*OYFH
zSc^yTa7VD7!98URCwu*@lfeEO;D@odjN#~t^H1`u*ofCst=Lfq{E8UJv*HA9t<e3Z
zjA3fE@3J&w7NOD9TA2mgaN-~CUBuHv059-79=Iw9%NS0VF>J<Mm%Dq*7|yK%cywvT
zJ9s-CO;lCF9e50<R}_*#!6)z|_H`WJT(=kO!|st0+Yc>-zxn_j!5s;7x{JyI>~1u*
zM|=G16fO*C{MyvAYo}qS<vZ~iZh>~&SPH~i(r9YqC>~sz@i^YYZ5=AhNvCTsIEeBx
zc#>xZje$nf0o;v)9mglT)qxvQ26S`V1#Bo|SYBlszK>V%Y@_Lml^&R@c(ZF#>0OmH
znqEx<&O$d2oKJyMC10nS(CYGZ>#zrJAunTy{g&csd{onzdCcNx+=Qvr%q|;n9^1+o
zj`u@gJ&t4JklOJ@>?~uLuQd~vF`P{ma9A>qLwQ!*UVA7_Y+oNDiED8z&x&1D)9V$|
zTAVwwWz*z(+&?4|W4M0Hrpd2bi*xPTdqJKR&*AeS5O}kU;oU(Olk4z(YM*0$fVS}m
zrn*c|1FdHF;RU=@wag^>5+7i`jJ-SPAj|2!*o8ZjSJvPc94TWs?EfZz1H=E=N?@$3
Q?*IS*07*qoM6N<$f`=K11poj5

literal 0
HcmV?d00001

diff --git a/includes/discovery/os/calix.inc.php b/includes/discovery/os/calix.inc.php
new file mode 100644
index 000000000..40ca58fdb
--- /dev/null
+++ b/includes/discovery/os/calix.inc.php
@@ -0,0 +1,6 @@
+<?php
+if (!$os) {
+    if (strstr($sysObjectId, '.6321.1.2.2.5.3')) {
+        $os = 'calix';
+    }
+}
diff --git a/includes/functions.php b/includes/functions.php
index e399a10ae..883bccc65 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -895,7 +895,7 @@ function is_port_valid($port, $device) {
                 }
             }
         }
-        if (empty($port['ifDescr'])) {
+        if (empty($port['ifDescr']) && !$device['os'] == "calix") {
             $valid = 0;
         }
         if ($device['os'] == "catos" && strstr($if, "vlan")) {
diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
new file mode 100644
index 000000000..610448189
--- /dev/null
+++ b/includes/polling/os/calix.inc.php
@@ -0,0 +1,4 @@
+<?php
+// Device might not have a card 1 (or even card2 if it is an E7-20)
+$version = trim(strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL),'"');
+$hardware = "Calix " . trim(snmp_get($device, "sysDescr.0", "-OQv"),'"');
diff --git a/mibs/CALIX-PRODUCT-MIB.my b/mibs/CALIX-PRODUCT-MIB.my
new file mode 100644
index 000000000..794df07e8
--- /dev/null
+++ b/mibs/CALIX-PRODUCT-MIB.my
@@ -0,0 +1,291 @@
+-- *****************************************************************
+-- CALIX-PRODUCT-MIB.my: Calix Networks Product Registrations
+--
+-- Calix confidential and proprietary.
+--
+-- Copyright (c) 2000-2009 Calix Networks, Inc.
+-- All rights reserved.
+-- *****************************************************************
+
+CALIX-PRODUCT-MIB DEFINITIONS ::= BEGIN
+
+    IMPORTS
+	MODULE-IDENTITY, OBJECT-IDENTITY
+	    FROM SNMPv2-SMI
+--	calixRegistrations, calixModules,
+--	calixProducts, calixEntities,
+--	calixGeneric, calixManagement
+	calixRegistrations, calixModules,
+	calixProducts, calixManagement
+	    FROM CALIX-SMI
+	;
+
+    calixProduct MODULE-IDENTITY
+	LAST-UPDATED "200706280000Z"
+	ORGANIZATION "Calix Networks, Inc."
+	CONTACT-INFO
+	    "       Calix Networks, Inc.
+
+	    Postal: 1035 North McDowell Boulevard
+		    Petaluma, CA  94954-1173
+		    USA
+
+	     Phone: +1 707 766 3000
+	       Fax: +1 707 766 3100
+
+	    E-mail: tech.support@calix.com"
+	DESCRIPTION
+	    "This management information module contains the
+	    administrative assignments which are used to
+	    uniquely identify physical components"
+
+	REVISION "200912100000Z"
+	DESCRIPTION
+	    "Changed E5 references to E7, with comments."
+	REVISION "200706280000Z"
+	DESCRIPTION
+	    "Updated for E5 and E5-100."
+	REVISION "200008310026Z"
+	DESCRIPTION
+	    "Initial release."
+
+	::= { calixModules 1 }
+
+
+--
+-- Calix Product Registrations
+--
+    c7 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The definitive identifier of the Calix Networks C7"
+	::= { calixProducts 1 }
+
+    e7 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The definitive identifier of the Calix Networks E7, E5-400, and E5-312
+         products."
+	::= { calixProducts 2 }
+
+    e7Modules OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Sub-tree to register the values assigned to E7 modules with the
+	     MODULE-IDENTITY construct."
+	::= { e7 1 }
+
+    e7Devices OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Sub-tree to register the device types which use the E7 modules.  These
+         registrations below this point are the sysObjectID values."
+	::= { e7 5 }
+
+    e5x312 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The E5-312 product."
+	::= { e7Devices 1 }
+
+    e5x400 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The E5-400 product."
+	::= { e7Devices 2 }
+
+    e7x2 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The E7-2 product."
+	::= { e7Devices 3 }
+
+    e7x20 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The E7-20 product."
+	::= { e7Devices 4 }
+
+    e5x100 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "The definitive identifier of the Calix Networks E5-100"
+	::= { calixProducts 3 }
+
+-- 
+-- Calix Entity Registrations
+--
+
+    c7ShelfAssembly OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "C7 Shelf Assembly Object"
+	::= { c7 1 }
+
+    c7Backplane OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "C7 Backplane Object"
+	::= { c7 2 }
+
+    c7Slot OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "C7 Card Object"
+	::= { c7 3 }
+
+    c7Card OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "C7 Card Object"
+	::= { c7 4 }
+
+    c7Port OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "C7 Port Object"
+	::= { c7 5 }
+
+-- C7 Cards
+
+    amp OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Administration and Maintenance Processor"
+	::= { c7Card 1 }
+
+    mta OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Metallic Test Access"
+	::= { c7Card 2 }
+
+    rapOc OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Resource and Arbitration Processor with OC-3/12/48, 1310 IR"
+	::= { c7Card 3 }
+
+    rapDs3 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Resource and Arbitration Processor with DS3 UNI"
+	::= { c7Card 4 }
+
+    rpots24 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "POTS, 24-port"
+	::= { c7Card 5 }
+
+    adsl24 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "ADSL, 24-port"
+	::= { c7Card 6 }
+
+    ds1x12 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS1, 12-port"
+	::= { c7Card 7 }
+
+    ds3x12s OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS3, 12-port, SONET mapped"
+	::= { c7Card 8 }
+
+    ds3x12p OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS3, 12-port, Packet"
+	::= { c7Card 9 }
+
+    oc3x4ir OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC3, 4-port, Packet/SONET, 1310 IR"
+	::= { c7Card 10 }
+
+    oc12x4ir OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC12, 4-port, Packet/SONET, 1310 IR"
+	::= { c7Card 11 }
+
+    oc48x1lr OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC48, 1-port, Packet/SONET, 1550 LR"
+	::= { c7Card 12 }
+
+    fta OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Fan Tray Assembly"
+	::= { c7Card 13 }
+
+    dfta OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Display Fan Tray Assembly"
+	::= { c7Card 14 }
+
+    mspa OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Metallic Service Protection - Side A"
+	::= { c7Card 15 }
+
+    mspb OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Metallic Service Protection - Side B"
+	::= { c7Card 16 }
+
+-- C7 Ports
+
+    ds0 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS0 Port Object"
+	::= { c7Port 1 }
+
+    c7Ds1 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS1 Port Object"
+	::= { c7Port 2 }
+
+    c7Ds3 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "DS3 Port Object"
+	::= { c7Port 3 }
+
+    adsl OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "ADSL Port Object"
+	::= { c7Port 4 }
+
+    oc3 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC-3 Port Object"
+	::= { c7Port 5 }
+
+    oc12 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC-12 Port Object"
+	::= { c7Port 6 }
+
+    oc48 OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "OC-48 Port Object"
+	::= { c7Port 7 }
+
+END
diff --git a/mibs/CALIX-SMI.my b/mibs/CALIX-SMI.my
new file mode 100644
index 000000000..600af7759
--- /dev/null
+++ b/mibs/CALIX-SMI.my
@@ -0,0 +1,78 @@
+-- *****************************************************************
+-- CALIX-SMI.my: Calix Networks Structure of Management Information
+--
+-- Calix confidential and proprietary.
+--
+-- Copyright (c) 2000 Calix Networks, Inc.
+-- All rights reserved.
+-- *****************************************************************
+
+CALIX-SMI DEFINITIONS ::= BEGIN
+    IMPORTS
+	MODULE-IDENTITY,
+	OBJECT-IDENTITY,
+	enterprises
+	    FROM SNMPv2-SMI;
+
+    calixNetworks MODULE-IDENTITY
+        LAST-UPDATED "200008310026Z"
+        ORGANIZATION "Calix Networks, Inc."
+        CONTACT-INFO
+	    "        Calix Networks, Inc.
+
+	     Postal: 1035 North McDowell Boulevard
+		     Petaluma, CA  94954-1173
+		     USA
+
+	      Phone: +1 707 766 3000
+	        Fax: +1 707 766 3100
+
+	     E-mail: tech.support@calix.com"
+	DESCRIPTION
+	    "The Structure of Management Information for
+	    Calix Networks"
+
+	REVISION "200008310026Z"
+	DESCRIPTION
+	    "Initial release."
+
+	::= { enterprises 6321 }
+
+    calixRegistrations OBJECT-IDENTITY
+    	STATUS current
+	DESCRIPTION
+	    "Sub-tree for product registrations."
+	::= { calixNetworks 1 }
+
+    calixModules OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Sub-tree to register the values assigned to modules with 
+	    the MODULE-IDENTITY construct."
+	::= { calixRegistrations 1 }
+
+    calixProducts OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Sub-tree to register the values product families."
+	::= { calixRegistrations 2 }
+
+    calixManagement OBJECT-IDENTITY
+	STATUS current
+	DESCRIPTION
+	    "Sub-tree for specific object and event definitions."
+	::= { calixNetworks 2 }
+
+--    calixCapabilities OBJECT-IDENTITY
+--	STATUS current
+--	DESCRIPTION
+--	    "Sub-tree for agent profiles."
+--	::= { calixNetworks 3 }
+
+--  calixExperimental OBJECT-IDENTITY
+--	STATUS current
+--	DESCRIPTION
+--	    "Sub-tree for experimental definitions."
+--	::= { calixNetworks 4 }
+
+END
diff --git a/mibs/E7-Calix-MIB b/mibs/E7-Calix-MIB
new file mode 100644
index 000000000..3b2459bc0
--- /dev/null
+++ b/mibs/E7-Calix-MIB
@@ -0,0 +1,1361 @@
+E7-Calix-MIB DEFINITIONS ::= BEGIN
+
+--
+-- Top-level infrastructure of the Calix E7 enterprise MIB tree
+--
+
+IMPORTS
+    Integer32,
+-- not used yet
+    Counter64,
+    IpAddress,
+    mib-2
+                    FROM SNMPv2-SMI
+    RowStatus,
+-- not used yet
+    DisplayString,
+-- not used yet
+    MacAddress
+                    FROM SNMPv2-TC
+    ifIndex         FROM IF-MIB
+    e7, e7Modules
+                    FROM CALIX-PRODUCT-MIB
+    E7AdminStatus,
+	E7CardType,
+	E7PowerLevel,
+	E7SnmpVers
+					FROM E7-TC;
+
+    e7ResourceModule MODULE-IDENTITY
+    LAST-UPDATED "201304030000Z"
+    ORGANIZATION "Calix Network, Inc."
+    CONTACT-INFO
+        "       Calix Networks, Inc.
+
+        Postal: 1035 North McDowell Boulevard
+                Petaluma, CA  94954-1173
+                USA
+
+         Phone: +1 707 766 3000
+           Fax: +1 707 766 3100
+
+        E-mail: tech.support@calix.com"
+    DESCRIPTION
+        "Top-level infrastructure for the Calix E7, E5-400, and E5-312 products,
+         except for Fault Management."
+    ::= { e7Modules 1 }
+
+-- really old regions (E5-8 era) can be reused
+    e7Resource             OBJECT IDENTIFIER ::= { e7 2 }
+    e7NodeResource           OBJECT IDENTIFIER ::= { e7Resource 1 }
+    e7CardGroup                OBJECT IDENTIFIER ::= { e7NodeResource 6 }
+    e7SystemGroup              OBJECT IDENTIFIER ::= { e7NodeResource 7 }
+    e7TrapDestGroup            OBJECT IDENTIFIER ::= { e7NodeResource 8 }
+    e7PortGroup            OBJECT IDENTIFIER ::= { e7NodeResource 9 }
+
+--
+--  Calix enterprise-specific management objects
+--
+
+--
+-- Card data
+--
+
+-- ZZZ note that only line cards are being implemented for now, as
+-- ZZZ E5-2 mods has no SCs
+e7CardTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7CardEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Card entries"
+    ::= { e7CardGroup 1 }
+
+e7CardEntry OBJECT-TYPE
+    SYNTAX      E7CardEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Card"
+    INDEX { e7CardBank, e7CardIndex }
+    ::= { e7CardTable 1 }
+
+E7CardEntry ::= SEQUENCE {
+    e7CardBank                   Integer32,
+    e7CardIndex                  Integer32,
+    e7CardRowStatus              RowStatus,
+	e7CardAdminStatus            E7AdminStatus,
+	e7CardProvType               E7CardType,
+	e7CardActualType             E7CardType,
+	e7CardSoftwareVersion        OCTET STRING,
+	e7CardSerialNumber			  DisplayString,
+	e7CardCurrentPowerLevel		 E7PowerLevel,
+	e7CardCleiCode				 OCTET STRING,
+	e7CardPartNumber			 OCTET STRING,
+	e7CardStartMacRange			 OCTET STRING,
+	e7CardEndMacRange            OCTET STRING,
+	e7CardHardwareRevision		OCTET STRING
+    }
+
+e7CardBank OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Bank number"
+    ::= { e7CardEntry 1 }
+
+e7CardIndex OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Slot number"
+    ::= { e7CardEntry 2 }
+
+e7CardRowStatus OBJECT-TYPE
+    SYNTAX      RowStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Controls creation & deletion of table entries.  Only
+                 active(get), createAndGo(set), and destroy(set) are
+                 supported."
+    ::= { e7CardEntry 3 }
+
+e7CardAdminStatus OBJECT-TYPE
+    SYNTAX      E7AdminStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Administrative status"
+    ::= { e7CardEntry 4 }
+
+e7CardProvType OBJECT-TYPE
+    SYNTAX      E7CardType
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Provisioned card type"
+    ::= { e7CardEntry 5 }
+
+e7CardActualType OBJECT-TYPE
+    SYNTAX      E7CardType
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Actual card type"
+    ::= { e7CardEntry 6 }
+
+e7CardSoftwareVersion OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Running software version, dotted string notation"
+    ::= { e7CardEntry 7 }
+
+e7CardSerialNumber OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Ascii Serial number for card"
+    ::= { e7CardEntry 8 }
+
+e7CardCurrentPowerLevel OBJECT-TYPE
+    SYNTAX      E7PowerLevel
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Current power level for card"
+    ::= { e7CardEntry 9 }
+
+e7CardCleiCode OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Ascii CLEI code for card"
+    ::= { e7CardEntry 10 }
+
+e7CardPartNumber OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Ascii part number"
+    ::= { e7CardEntry 11 }
+
+e7CardStartMacRange OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Start of MAC range (ascii)"
+    ::= { e7CardEntry 12 }
+
+e7CardEndMacRange OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "End of MAC range (ascii)"
+    ::= { e7CardEntry 13 }
+
+e7CardHardwareRevision OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Hardware revision, dotted string notation"
+    ::= { e7CardEntry 14 }
+
+e7CardTableEnd OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "denotes the end of the e7CardTable (for getnext)"
+    ::= { e7CardGroup 2 }
+
+--
+--system
+--
+
+e7SystemId OBJECT-TYPE
+   SYNTAX      OCTET STRING
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Unique name of the system"
+   ::= {e7SystemGroup 1}
+
+e7SystemLocation OBJECT-TYPE
+   SYNTAX      OCTET STRING
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Location of the system"
+   ::= {e7SystemGroup 2}
+
+e7SystemAutoUpgrade OBJECT-TYPE
+   SYNTAX      INTEGER {
+               		no(0),
+                   	yes(1)
+					}
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Auto upgrade out-of-rev cards on arrival"
+   ::= {e7SystemGroup 3}
+
+e7SystemTelnetServer OBJECT-TYPE
+   SYNTAX      INTEGER {
+               		no(0),
+                   	yes(1)
+					}
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Enable CLI access via telnet (in addition to ssh)"
+   ::= {e7SystemGroup 4}
+
+e7SystemUnsecuredWeb OBJECT-TYPE
+   SYNTAX      INTEGER {
+               		no(0),
+                   	yes(1)
+					}
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Enable unsecured web-access (non-ssh)"
+   ::= {e7SystemGroup 5}
+
+e7SystemPasswordExpiry OBJECT-TYPE
+   SYNTAX      Integer32
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Craft user password expiry, in days"
+   ::= {e7SystemGroup 6}
+
+e7SystemDnsPrimary OBJECT-TYPE
+   SYNTAX      IpAddress
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "IP address of primary DNS server"
+   ::= {e7SystemGroup 7}
+
+e7SystemDnsSecondary OBJECT-TYPE
+   SYNTAX      IpAddress
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "IP address of secondary DNS server"
+   ::= {e7SystemGroup 8}
+
+e7SystemTimezone OBJECT-TYPE
+   SYNTAX      OCTET STRING
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Timezone for system"
+   ::= {e7SystemGroup 9}
+
+e7SystemChassisSerialNumber OBJECT-TYPE
+   SYNTAX      DisplayString
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Chassis serial number"
+   ::= {e7SystemGroup 10}
+
+e7SystemChassisMacAddress OBJECT-TYPE
+   SYNTAX      MacAddress
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "Chassis MAC address"
+   ::= {e7SystemGroup 11}
+
+e7SystemTime OBJECT-TYPE
+   SYNTAX      DisplayString
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "system time"
+   ::= {e7SystemGroup 12}
+
+e7SystemDate OBJECT-TYPE
+   SYNTAX      DisplayString
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION "system date"
+   ::= {e7SystemGroup 13}
+
+-- ZZZ leaving chassis for different object class, as there may be several
+-- ZZZ instances in the future
+
+--
+--e7TrapDestGroup
+--
+
+e7TrapDestTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7TrapDestEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains SNMP Trap Dest entries"
+    ::= { e7TrapDestGroup 1 }
+
+e7TrapDestEntry OBJECT-TYPE
+    SYNTAX      E7TrapDestEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to SNMP Trap Dest"
+    INDEX { e7TrapDestIndex }
+    ::= { e7TrapDestTable 1 }
+
+E7TrapDestEntry ::= SEQUENCE {
+    e7TrapDestIndex                  Integer32,
+    e7TrapDestRowStatus              RowStatus,
+	e7TrapDestAdminStatus            E7AdminStatus,
+	e7TrapDestIpAddress              IpAddress,
+	e7TrapDestPortNumber             Integer32,
+	e7TrapDestSnmpVers               E7SnmpVers,
+	e7TrapDestV3User			     OCTET STRING,
+	e7TrapDestCommunity              OCTET STRING
+    }
+
+e7TrapDestIndex OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "trap index"
+    ::= { e7TrapDestEntry 1 }
+
+e7TrapDestRowStatus OBJECT-TYPE
+    SYNTAX      RowStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Controls creation & deletion of table entries.  Only
+                 active(get), createAndGo(set), and destroy(set) are
+                 supported."
+    ::= { e7TrapDestEntry 2 }
+
+e7TrapDestAdminStatus OBJECT-TYPE
+    SYNTAX      E7AdminStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Administrative status"
+    ::= { e7TrapDestEntry 3 }
+
+e7TrapDestIpAddress OBJECT-TYPE
+    SYNTAX      IpAddress
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "destination IP address"
+    ::= { e7TrapDestEntry 4 }
+
+e7TrapDestPortNumber OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "destination UDP port number"
+    ::= { e7TrapDestEntry 5 }
+
+e7TrapDestSnmpVers OBJECT-TYPE
+    SYNTAX      E7SnmpVers
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "v2c or v3 trap type"
+    ::= { e7TrapDestEntry 6 }
+
+e7TrapDestV3User OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "user used in v3 traps" 
+    ::= { e7TrapDestEntry 7 }
+
+e7TrapDestCommunity OBJECT-TYPE
+    SYNTAX      OCTET STRING
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "community string used in v2c traps"
+    ::= { e7TrapDestEntry 8 }
+
+--
+--e7PortGroup
+--
+
+e7VdslPortGroup OBJECT IDENTIFIER ::= { e7PortGroup 1 }
+
+e7VdslPortTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslPortEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl port entries"
+    ::= { e7VdslPortGroup 1 }
+
+e7VdslPortEntry OBJECT-TYPE
+    SYNTAX      E7VdslPortEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl Port entries"
+    INDEX { ifIndex }
+    ::= { e7VdslPortTable 1 }
+
+E7VdslPortEntry ::= SEQUENCE {
+        e7VdslPortRowStatus          RowStatus,
+	e7VdslPortAdminStatus        E7AdminStatus,
+	e7VdslPortCurrTxRate         Integer32,
+	e7VdslPortCurrRxRate         Integer32,
+	e7VdslPortStatsProtocol      INTEGER,
+	e7VdslPortLineState          INTEGER
+    }
+
+e7VdslPortRowStatus OBJECT-TYPE
+    SYNTAX      RowStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Controls creation & deletion of table entries.  Only
+                 active(get), createAndGo(set), and destroy(set) are
+                 supported."
+    ::= { e7VdslPortEntry 1 }
+
+e7VdslPortAdminStatus OBJECT-TYPE
+    SYNTAX      E7AdminStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Administrative status"
+    ::= { e7VdslPortEntry 2 }
+
+e7VdslPortCurrTxRate OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Actual transmit data rate this port "
+    ::= { e7VdslPortEntry 3 }
+
+e7VdslPortCurrRxRate OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Actual receive data rate this port "
+    ::= { e7VdslPortEntry 4 }
+
+e7VdslPortStatsProtocol OBJECT-TYPE
+    SYNTAX      INTEGER {
+                        none(1),
+                        vdsl8a(2),
+                        vdsl8b(3),
+                        vdsl8c(4),
+                        vdsl8d(5),
+                        vdsl12a(6),
+                        vdsl12b(7),
+                        vdsl17a(8),
+                        gdmt(9),
+                        glite(10),
+                        adsl2(11),
+                        adsl2plus(12),
+                        t1413(13)
+		}
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Administrative status"
+    ::= { e7VdslPortEntry 5 }
+
+e7VdslPortLineState OBJECT-TYPE
+    SYNTAX      INTEGER {
+                        idleNotConfigured(1),
+                        idleConfigured(2),
+                        initialization(3),
+                        training(4),
+                        showtime(5),
+                        showtimeL2(6),
+                        ldInit(7),
+                        ldFetch(8),
+                        ldDone(9),
+                        ldFailed(10)
+		}
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Line operational status"
+    ::= { e7VdslPortEntry 6 }
+
+e7VdslRateTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslRateEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl data rate entries"
+    ::= { e7VdslPortGroup 2 }
+
+e7VdslRateEntry OBJECT-TYPE
+    SYNTAX      E7VdslRateEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl Rate entries"
+    INDEX { ifIndex }
+    ::= { e7VdslRateTable 1 }
+
+E7VdslRateEntry ::= SEQUENCE {
+        e7VdslRateRowStatus          RowStatus,
+	e7VdslRateAdminStatus        E7AdminStatus,
+	e7VdslRateProvDataRateUs     Integer32,
+	e7VdslRateProvDataRateDs     Integer32
+    }
+
+e7VdslRateRowStatus OBJECT-TYPE
+    SYNTAX      RowStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Controls creation & deletion of table entries.  Only
+                 active(get), createAndGo(set), and destroy(set) are
+                 supported."
+    ::= { e7VdslRateEntry 1 }
+
+e7VdslRateAdminStatus OBJECT-TYPE
+    SYNTAX      E7AdminStatus
+    MAX-ACCESS  read-create
+    STATUS      current
+    DESCRIPTION "Administrative status"
+    ::= { e7VdslRateEntry 2 }
+
+e7VdslRateProvDataRateUs OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Provisioned data rate upstream "
+    ::= { e7VdslRateEntry 3 }
+
+e7VdslRateProvDataRateDs OBJECT-TYPE
+    SYNTAX      Integer32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION "Provisioned data rate downstream "
+    ::= { e7VdslRateEntry 4 }
+
+e7VdslPhysTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslPhysEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl physical entries"
+    ::= { e7VdslPortGroup 3 }
+
+e7VdslPhysEntry OBJECT-TYPE
+    SYNTAX      E7VdslPhysEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl physical entries"
+    INDEX { ifIndex, e7VdslPhysSide }
+    ::= { e7VdslPhysTable 1 }
+
+E7VdslPhysEntry ::= SEQUENCE {
+        e7VdslPhysSide                          INTEGER,
+	e7VdslPhysCurrSnrMargin                 Integer32,
+	e7VdslPhysCurrAtn                       Integer32,
+	e7VdslPhysCurrOutputPwr                 Integer32,
+	e7VdslPhysInterleaveDelay               Integer32,
+	e7VdslPhysImpulseNoiseProtection        Integer32,
+        e7VdslPhysTransmissionMode              INTEGER
+    }
+
+e7VdslPhysSide OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    downstream(1),
+                    upstream(2)
+                 }
+    MAX-ACCESS   not-accessible
+    STATUS       current
+    DESCRIPTION
+           "Identifies whether the transceiver is downstream or upstream."
+    ::= { e7VdslPhysEntry 1 }
+
+e7VdslPhysCurrSnrMargin OBJECT-TYPE
+       SYNTAX       Integer32 (-640..630)
+       UNITS        "0.1dBm"
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Noise Margin as seen by this Vtu with respect to its
+           received signal. " 
+        ::= { e7VdslPhysEntry 2 }
+
+e7VdslPhysCurrAtn OBJECT-TYPE
+       SYNTAX       Integer32 (0..1280)
+       UNITS        "0.1dBm"
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Measured difference in the total power transmitted by
+           the peer Vtu and the total power received by this Vtu."
+        ::= { e7VdslPhysEntry 3 }
+
+e7VdslPhysCurrOutputPwr OBJECT-TYPE
+       SYNTAX       Integer32 (-310..310)
+       UNITS        "0.1dBm"
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Measured total output power transmitted by this VTU.
+           This is the measurement that was reported during
+           the last activation sequence."
+       ::= { e7VdslPhysEntry 4 }
+
+e7VdslPhysInterleaveDelay OBJECT-TYPE
+       SYNTAX       Integer32
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Actual interleaving delay (in milliseconds)."
+       ::= { e7VdslPhysEntry 5 }
+
+e7VdslPhysImpulseNoiseProtection OBJECT-TYPE
+       SYNTAX       Integer32
+       UNITS        "0.1 symbol"
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Actual impulse noise protection."
+       ::= { e7VdslPhysEntry 6 }
+
+e7VdslPhysTransmissionMode OBJECT-TYPE
+       SYNTAX       INTEGER {
+                        none(0),
+                        t1413(1),
+                        vdsl2a(2),
+                        gdmt(3),
+                        adsl2m(4),
+                        adsl2plusm(5),
+                        glite(6),
+                        vdsl2b(7),
+                        vdsl2c(8),
+                        vdsl2(9),
+                        readsl12(10),
+                        adsl2plus(11),
+                        adsl2(12)
+                    }
+       MAX-ACCESS   read-only
+       STATUS       current
+       DESCRIPTION
+           "Actual transmission mode."
+       ::= { e7VdslPhysEntry 7 }
+
+
+
+e7VdslPortCfgTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslPortCfgEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl port configuration entries"
+    ::= { e7VdslPortGroup 4 }
+
+e7VdslPortCfgEntry OBJECT-TYPE
+    SYNTAX      E7VdslPortCfgEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl Port configuration entries"
+    INDEX { ifIndex }
+    ::= { e7VdslPortCfgTable 1 }
+
+E7VdslPortCfgEntry ::= SEQUENCE {
+        e7VdslPortCfgServiceType                    INTEGER,
+        e7VdslPortCfgPathLatency                    INTEGER,
+        e7VdslPortCfgVdslProfile                    INTEGER,
+        e7VdslPortCfgDsMinRate                      Integer32,
+        e7VdslPortCfgDsMaxRate                      Integer32,
+        e7VdslPortCfgUsMinRate                      Integer32,
+        e7VdslPortCfgUsMaxRate                      Integer32,
+        e7VdslPortCfgDsMinInp                       INTEGER,
+        e7VdslPortCfgUsMinInp                       INTEGER,
+        e7VdslPortCfgDsInterleaveMaxLatency         Integer32,
+        e7VdslPortCfgUsInterleaveMaxLatency         Integer32,
+        e7VdslPortCfgDsMinSnr                       Integer32,
+        e7VdslPortCfgDsMaxSnr                       Integer32,
+        e7VdslPortCfgDsTargetSnr                    Integer32,
+        e7VdslPortCfgUsMinSnr                       Integer32,
+        e7VdslPortCfgUsMaxSnr                       Integer32,
+        e7VdslPortCfgUsTargetSnr                    Integer32,
+        e7VdslPortCfgPsdMask                        INTEGER,
+        e7VdslPortCfgLastTemplate                   DisplayString
+    }
+
+e7VdslPortCfgServiceType OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    auto(1),
+                    mm(2),
+                    mm2plus(3),
+                    t1413(4),
+                    gdmt(5),
+                    glite(6),
+                    adsl2(7),
+                    adsl2plus(8),
+                    readsl2(9),
+                    annexm(10),
+                    vdsl2(11), 
+                    vdsl2mm(12)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured service type. "
+    ::= { e7VdslPortCfgEntry 1 }
+
+e7VdslPortCfgPathLatency OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    fast(1),
+                    interleaved(2),
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured latency. "
+    ::= { e7VdslPortCfgEntry 2 }
+
+e7VdslPortCfgVdslProfile OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    auto(1),
+                    vdsl8a(2),
+                    vdsl8b(3),
+                    vdsl8c(4),
+                    vdsl8d(5),
+                    vdsl12a(6),
+                    vdsl12b(7),
+                    vdsl17a(8),
+                    vdsl30a(9)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured profile. "
+    ::= { e7VdslPortCfgEntry 3 }
+
+e7VdslPortCfgDsMinRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum rate. "
+    ::= { e7VdslPortCfgEntry 4 }
+
+e7VdslPortCfgDsMaxRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream maximum rate. "
+    ::= { e7VdslPortCfgEntry 5 }
+
+e7VdslPortCfgUsMinRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum rate. "
+    ::= { e7VdslPortCfgEntry 6 }
+
+e7VdslPortCfgUsMaxRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream maximum rate. "
+    ::= { e7VdslPortCfgEntry 7 }
+
+e7VdslPortCfgDsMinInp OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    invalid(0),
+                    none(1),
+                    halfSym(2),
+                    oneSym(3),
+                    twoSym(4),
+                    threeSym(5),
+                    fourSym(6),
+                    fiveSym(7),
+                    sixSym(8),
+                    sevenSym(9),
+                    eightSym(10),
+                    nineSym(11),
+                    tenSym(12),
+                    elevenSym(13),
+                    twelveSym(14),
+                    thirteenSym(15),
+                    fourteenSym(16),
+                    fifteenSym(17),
+                    sixteenSym(18)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum impulse noise protection. "
+    ::= { e7VdslPortCfgEntry 8 }
+
+e7VdslPortCfgUsMinInp OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    invalid(0),
+                    none(1),
+                    halfSym(2),
+                    oneSym(3),
+                    twoSym(4),
+                    threeSym(5),
+                    fourSym(6),
+                    fiveSym(7),
+                    sixSym(8),
+                    sevenSym(9),
+                    eightSym(10),
+                    nineSym(11),
+                    tenSym(12),
+                    elevenSym(13),
+                    twelveSym(14),
+                    thirteenSym(15),
+                    fourteenSym(16),
+                    fifteenSym(17),
+                    sixteenSym(18)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum impulse noise protection. "
+    ::= { e7VdslPortCfgEntry 9 }
+
+e7VdslPortCfgDsInterleaveMaxLatency OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream interleave maximum latency. A
+value of 0x7FFFFFFF (2147483647) indicates the setting equal to 'auto'. "
+    ::= { e7VdslPortCfgEntry 10 }
+
+e7VdslPortCfgUsInterleaveMaxLatency OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream interleave maximum latency. "
+    ::= { e7VdslPortCfgEntry 11 }
+
+e7VdslPortCfgDsMinSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum SNR. "
+    ::= { e7VdslPortCfgEntry 12 }
+
+e7VdslPortCfgDsMaxSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream maximum SNR. "
+    ::= { e7VdslPortCfgEntry 13 }
+
+e7VdslPortCfgDsTargetSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream target SNR. "
+    ::= { e7VdslPortCfgEntry 14 }
+
+e7VdslPortCfgUsMinSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum SNR. "
+    ::= { e7VdslPortCfgEntry 15 }
+
+e7VdslPortCfgUsMaxSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream maximum SNR. "
+    ::= { e7VdslPortCfgEntry 16 }
+
+e7VdslPortCfgUsTargetSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream target SNR. "
+    ::= { e7VdslPortCfgEntry 17 }
+
+e7VdslPortCfgPsdMask OBJECT-TYPE
+    SYNTAX       INTEGER {
+                     anus0(1),
+                     aeu32(2),
+                     aeu36(3),
+                     aeu40(4),
+                     aeu44(5),
+                     aeu48(6),
+                     aeu52(7),
+                     aeu56(8),
+                     aeu60(9),
+                     aeu64(10),
+                     aeu128(11),
+                     aadlu32(12),
+                     aadlu36(13),
+                     aadlu40(14),
+                     aadlu44(15),
+                     aadlu48(16),
+                     aadlu52(17),
+                     aadlu56(18),
+                     aadlu60(19),
+                     aadlu64(20),
+                     aadlu128(21),
+                     b81(22),
+                     b82(23),
+                     b83(24),
+                     b84(25),
+                     b85(26),
+                     b86(27),
+                     b87(28),
+                     b88(29),
+                     b89(30),
+                     b810(31),
+                     b811(32),
+                     b812(33),
+                     b813(34),
+                     b814(35),
+                     b815(36),
+                     b816(37),
+                     b71(38),
+                     b72(39),
+                     b73(40),
+                     b74(41),
+                     b75(42),
+                     b76(43),
+                     b77(44),
+                     b78(45),
+                     b79(46),
+                     b710(47),
+                     c138b(48),
+                     c276b(49),
+                     c138co(50),
+                     c276co(51),
+                     ctcmisdn(52),
+                     vdsl1qamcompatible(53)
+                 } 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured PSD mask. "
+    ::= { e7VdslPortCfgEntry 18 }
+
+e7VdslPortCfgLastTemplate OBJECT-TYPE
+   SYNTAX      DisplayString
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION 
+           "VDSL port configured last template name. "
+    ::= { e7VdslPortCfgEntry 19 }
+
+e7VdslPortCfgTemplateTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslPortCfgTemplateEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl port configuration template entries"
+    ::= { e7VdslPortGroup 5 }
+
+e7VdslPortCfgTemplateEntry OBJECT-TYPE
+    SYNTAX      E7VdslPortCfgTemplateEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl Port configuration template entries"
+    INDEX { e7VdslPortCfgTemplateIndex }
+    ::= { e7VdslPortCfgTemplateTable 1 }
+
+E7VdslPortCfgTemplateEntry ::= SEQUENCE {
+        e7VdslPortCfgTemplateIndex                          Integer32,
+        e7VdslPortCfgTemplateName                           DisplayString,
+        e7VdslPortCfgTemplateServiceType                    INTEGER,
+        e7VdslPortCfgTemplatePathLatency                    INTEGER,
+        e7VdslPortCfgTemplateVdslProfile                    INTEGER,
+        e7VdslPortCfgTemplateDsMinRate                      Integer32,
+        e7VdslPortCfgTemplateDsMaxRate                      Integer32,
+        e7VdslPortCfgTemplateUsMinRate                      Integer32,
+        e7VdslPortCfgTemplateUsMaxRate                      Integer32,
+        e7VdslPortCfgTemplateDsMinInp                       INTEGER,
+        e7VdslPortCfgTemplateUsMinInp                       INTEGER,
+        e7VdslPortCfgTemplateDsInterleaveMaxLatency         Integer32,
+        e7VdslPortCfgTemplateUsInterleaveMaxLatency         Integer32,
+        e7VdslPortCfgTemplateDsMinSnr                       Integer32,
+        e7VdslPortCfgTemplateDsMaxSnr                       Integer32,
+        e7VdslPortCfgTemplateDsTargetSnr                    Integer32,
+        e7VdslPortCfgTemplateUsMinSnr                       Integer32,
+        e7VdslPortCfgTemplateUsMaxSnr                       Integer32,
+        e7VdslPortCfgTemplateUsTargetSnr                    Integer32,
+        e7VdslPortCfgTemplatePsdMask                        INTEGER
+    }
+
+e7VdslPortCfgTemplateIndex OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured template index. "
+    ::= { e7VdslPortCfgTemplateEntry 1 }
+
+e7VdslPortCfgTemplateName OBJECT-TYPE
+   SYNTAX      DisplayString
+   MAX-ACCESS  read-create
+   STATUS      current
+   DESCRIPTION 
+           "VDSL port configured template name. "
+    ::= { e7VdslPortCfgTemplateEntry 2 }
+
+e7VdslPortCfgTemplateServiceType OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    auto(1),
+                    mm(2),
+                    mm2plus(3),
+                    t1413(4),
+                    gdmt(5),
+                    glite(6),
+                    adsl2(7),
+                    adsl2plus(8),
+                    readsl2(9),
+                    annexm(10),
+                    vdsl2(11), 
+                    vdsl2mm(12)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured service type. If template attribute is not
+set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 3 }
+
+e7VdslPortCfgTemplatePathLatency OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    fast(1),
+                    interleaved(2),
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured latency. If template attribute is not set,
+value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 4 }
+
+e7VdslPortCfgTemplateVdslProfile OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    none(0),
+                    auto(1),
+                    vdsl8a(2),
+                    vdsl8b(3),
+                    vdsl8c(4),
+                    vdsl8d(5),
+                    vdsl12a(6),
+                    vdsl12b(7),
+                    vdsl17a(8),
+                    vdsl30a(9)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured profile. If template attribute is not set,
+value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 5 }
+
+e7VdslPortCfgTemplateDsMinRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum rate. If template
+attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 6 }
+
+e7VdslPortCfgTemplateDsMaxRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream maximum rate. If template
+attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 7 }
+
+e7VdslPortCfgTemplateUsMinRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum rate. If template attribute
+is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 8 }
+
+e7VdslPortCfgTemplateUsMaxRate OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream maximum rate. If template attribute
+is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 9 }
+
+e7VdslPortCfgTemplateDsMinInp OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    invalid(0),
+                    none(1),
+                    halfSym(2),
+                    oneSym(3),
+                    twoSym(4),
+                    threeSym(5),
+                    fourSym(6),
+                    fiveSym(7),
+                    sixSym(8),
+                    sevenSym(9),
+                    eightSym(10),
+                    nineSym(11),
+                    tenSym(12),
+                    elevenSym(13),
+                    twelveSym(14),
+                    thirteenSym(15),
+                    fourteenSym(16),
+                    fifteenSym(17),
+                    sixteenSym(18)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum impulse noise protection. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 10 }
+
+e7VdslPortCfgTemplateUsMinInp OBJECT-TYPE
+    SYNTAX      INTEGER {
+                    invalid(0),
+                    none(1),
+                    halfSym(2),
+                    oneSym(3),
+                    twoSym(4),
+                    threeSym(5),
+                    fourSym(6),
+                    fiveSym(7),
+                    sixSym(8),
+                    sevenSym(9),
+                    eightSym(10),
+                    nineSym(11),
+                    tenSym(12),
+                    elevenSym(13),
+                    twelveSym(14),
+                    thirteenSym(15),
+                    fourteenSym(16),
+                    fifteenSym(17),
+                    sixteenSym(18)
+                 }
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum impulse noise protection. If
+template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 11 }
+
+e7VdslPortCfgTemplateDsInterleaveMaxLatency OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream interleave maximum latency. A
+value of 0x7FFFFFFF (2147483647) indicates the setting equal to 'auto'. "
+    ::= { e7VdslPortCfgTemplateEntry 12 }
+
+e7VdslPortCfgTemplateUsInterleaveMaxLatency OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream interleave maximum latency. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 13 }
+
+e7VdslPortCfgTemplateDsMinSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream minimum SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 14 }
+
+e7VdslPortCfgTemplateDsMaxSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream maximum SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 15 }
+
+e7VdslPortCfgTemplateDsTargetSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured downstream target SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 16 }
+
+e7VdslPortCfgTemplateUsMinSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream minimum SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647). "
+    ::= { e7VdslPortCfgTemplateEntry 17 }
+
+e7VdslPortCfgTemplateUsMaxSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream maximum SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 18 }
+
+e7VdslPortCfgTemplateUsTargetSnr OBJECT-TYPE
+    SYNTAX       Integer32 
+    UNITS        "0.1 dB"
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured upstream target SNR. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647)."
+    ::= { e7VdslPortCfgTemplateEntry 19 }
+
+e7VdslPortCfgTemplatePsdMask OBJECT-TYPE
+    SYNTAX       INTEGER {
+                     anus0(1),
+                     aeu32(2),
+                     aeu36(3),
+                     aeu40(4),
+                     aeu44(5),
+                     aeu48(6),
+                     aeu52(7),
+                     aeu56(8),
+                     aeu60(9),
+                     aeu64(10),
+                     aeu128(11),
+                     aadlu32(12),
+                     aadlu36(13),
+                     aadlu40(14),
+                     aadlu44(15),
+                     aadlu48(16),
+                     aadlu52(17),
+                     aadlu56(18),
+                     aadlu60(19),
+                     aadlu64(20),
+                     aadlu128(21),
+                     b81(22),
+                     b82(23),
+                     b83(24),
+                     b84(25),
+                     b85(26),
+                     b86(27),
+                     b87(28),
+                     b88(29),
+                     b89(30),
+                     b810(31),
+                     b811(32),
+                     b812(33),
+                     b813(34),
+                     b814(35),
+                     b815(36),
+                     b816(37),
+                     b71(38),
+                     b72(39),
+                     b73(40),
+                     b74(41),
+                     b75(42),
+                     b76(43),
+                     b77(44),
+                     b78(45),
+                     b79(46),
+                     b710(47),
+                     c138b(48),
+                     c276b(49),
+                     c138co(50),
+                     c276co(51),
+                     ctcmisdn(52),
+                     vdsl1qamcompatible(53)
+                 } 
+    MAX-ACCESS   read-write
+    STATUS       current
+    DESCRIPTION
+           "VDSL port configured PSD mask. If template attribute is not set, value reported will be 0x7FFFFFFF (2147483647). "
+    ::= { e7VdslPortCfgTemplateEntry 20 }
+
+e7VdslPortPerfIntervalTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF E7VdslPortPerfIntervalEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "Contains Vdsl port performance monitoring entries"
+    ::= { e7VdslPortGroup 6 }
+
+e7VdslPortPerfIntervalEntry OBJECT-TYPE
+    SYNTAX      E7VdslPortPerfIntervalEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION "List of attributes related to Vdsl Port performance
+monitoring entries"
+    INDEX { ifIndex, e7VdslPortPerfIntervalPhysSide,
+e7VdslPortPerfIntervalNumber }
+    ::= { e7VdslPortPerfIntervalTable 1 }
+
+E7VdslPortPerfIntervalEntry ::= SEQUENCE {
+        e7VdslPortPerfIntervalPhysSide                           Integer32,
+        e7VdslPortPerfIntervalNumber                             Integer32,
+        e7VdslPortPerfIntervalUAS                                Integer32
+    }
+
+e7VdslPortPerfIntervalPhysSide OBJECT-TYPE
+    SYNTAX       Integer32 
+    MAX-ACCESS   not-accessible
+    STATUS       current
+    DESCRIPTION
+           "VDSL port performance interval phyical side. "
+    ::= { e7VdslPortPerfIntervalEntry 1 }
+
+e7VdslPortPerfIntervalNumber OBJECT-TYPE
+   SYNTAX      Integer32
+   MAX-ACCESS  not-accessible
+   STATUS      current
+   DESCRIPTION 
+           "VDSL port performance interval number. "
+    ::= { e7VdslPortPerfIntervalEntry 2 }
+
+e7VdslPortPerfIntervalUAS OBJECT-TYPE
+   SYNTAX      Integer32
+   MAX-ACCESS  read-only
+   STATUS      current
+   DESCRIPTION 
+           "VDSL port performance interval unavailable seconds. "
+    ::= { e7VdslPortPerfIntervalEntry 3 }
+
+END
diff --git a/mibs/E7-TC.my b/mibs/E7-TC.my
new file mode 100644
index 000000000..20773751f
--- /dev/null
+++ b/mibs/E7-TC.my
@@ -0,0 +1,689 @@
+-- *****************************************************************
+-- E7-TC.my: Calix Networks E7 Textual Conventions
+--
+-- Calix confidential and proprietary.
+--
+-- Copyright (c) 2007-2009 Calix Networks, Inc.
+-- All rights reserved.
+-- *****************************************************************
+
+E7-TC DEFINITIONS ::= BEGIN
+
+    IMPORTS
+	TEXTUAL-CONVENTION
+	    FROM SNMPv2-TC
+	;
+
+E7AlarmType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 supported alarms"
+    SYNTAX INTEGER {
+        none(0),
+		logInit(1),
+        moreToShow(2),
+        unequipped(3),
+        notOperational(4),
+        mismatchEquipmentAttributes(5),
+        backupFilesExist(6),
+        restoreFileExists(7),
+        multipleDatabases(8),
+        improperRemoval(9),
+        badInventory(10),
+        unsupportedEquipment(11),
+        lowSoftwareResources(12),
+        ntpFreeRunning(13),
+        ntpServer1Down(14),
+        ntpServer2Down(15),
+        ntpServer3Down(16),
+        databaseFailure(17),
+        cardTooCold(18),
+        equipOverheat(19),
+        lossOfSignal(20),
+        aggLinkDown(21),
+        erpsIsolatedNode(22),
+        erpsRingPortDown(23),
+        erpsRingDown(24),
+        erpsSecondRingMaster(25),
+        erpsActingRingMaster(26),
+        fanFailure(27),
+        rstpNoPrimary(28),
+        rstpNoSecondary(29),
+        rstpMultiplePrimaries(30),
+        rstpMultipleSecondaries(31),
+        airCompressorFail(32),
+        airConditioningFail(33),
+        airDryerFail(34),
+        batteryDischarging(35),
+        batteryFail(36),
+        centralizedPwrFail(37),
+        commericalPwrFail(38),
+        coolingFanFail(39),
+        engineFail(40),
+        engineOperating(41),
+        explosiveGas(42),
+        fireDetectorFail(43),
+        fire(44),
+        flood(45),
+        fuseFail(46),
+        generatorFail(47),
+        highAirflow(48),
+        highHumidity(49),
+        highTemp(50),
+        highWater(51),
+        intrusion(52),
+        lowBatterVoltage(53),
+        lowCablePressure(54),
+        lowFuel(55),
+        lowHumidity(56),
+        lowTemp(57),
+        lowWater(58),
+        miscellaneous(59),
+        openDoor(60),
+        pumpFail(61),
+        rectifierFail(62),
+        rectifierHighVoltage(63),
+        rectifierLowVoltate(64),
+        smoke(65),
+        toxicGas(66),
+        ventilationFail(67),
+        releaseNotCommitted(68),
+        upgradeInProgress(69),
+        newReleaseIsReady(70),
+        moduleFault(71),
+        contactOffNormal(72),
+        powerAFail(73),
+        powerBFail(74),
+        bootDataCorrupt(75),
+        power(76),
+        thermal(77),
+        security(78),
+        lacpFault(79),
+        rstpFault(80),
+        unrecognizedSfp(81),
+        shelfError(82),
+        differentVersion(83),
+        ponLaserEol(84),
+        lossOfPon(85),
+        ontMissing(86),
+        ontMismatch(87),
+        ontProvError(88),
+        ontEquipFailed(89),
+        ontOnBattery(90),
+        ontBatteryMissing(91),
+        ontBatteryFailed(92),
+        ontBatteryLow(93),
+        ontRfSignalLow(94),
+        ontRfReturnLaserEol(95),
+        ontEthDown(96),
+        ontDs1LosLof(97),
+        ontDs1Rai(98),
+        ontDs1Ais(99),
+        noStandbyController(100),
+        noBpDataPath(101),
+        svcWithNoFac(102),
+        timingFreerun(103),
+        timingHoldover(104),
+        timingLockedA(105),
+        timingLockedB(106),
+        timingFailSrcA(107),
+        timingFailSrcB(108),
+        timingFailDevice(109),
+        equipmentFailure(110),
+        ontSoftwareMismatch(111),
+        unused112(112),
+        switchingPowerSupplyAFailed(113),
+        switchingPowerSupplyBFailed(114),
+        ontDs1LosMatrix(115),
+        ontDs1LofMatrix(116),
+        ponBwOverSubscribed(117),
+        reserved118(118),
+        reserved119(119),
+        reserved120(120),
+        duplicateOntRegId(121),
+        gponReplicationResourceExhausted(122),
+        cpldOutOfRev(123),
+        bpduGuard(124),
+        moduleNotForStacking(125),
+        ethOamMepNearEndMaxLoss(126),
+        ethOamMepNearEndAvgLoss(127),
+        ethOamMepNearFarMaxLoss(128),
+        ethOamMepNearFarAvgLoss(129),
+        ethOamMepMaxDelayMeasurement(130),
+        ethOamMepAvgDelayMeasurement(131),
+        ethOamMepMaxDelayVariation(132),
+        ethOamMepCcmLossOfContinuity(133),
+        ethOamMepCcmRxInterfaceNotUp(134),
+        ethOamMepCcmRxUnexpectedMeg(135),
+        ethOamMepCcmRxUnexpectedMep(136),
+        ethOamMepCcmRxUnexpectedPeriod(137),
+        stackingRingPortDown(138),
+        stackingRingSecondMaster(139),
+        stackingRingActingMaster(140),
+        ontPwe3FarEndLossOfPackets(141),
+        ontPwe3FarEndLossOfSignal(142),
+        ontPwe3MalformedPackets(143),
+        ethOamMepCcmRxWithRdi(144),
+        ethOamMepAvgDelayThresholdExceeded(145),
+        rfc2544Loopback(146),
+        e5TooOld(147),
+        bpduUnknown(148),
+        equipIdFail(149),
+        noTimingCard(150),
+        efmDown(151),
+        rfiSignalLoss(152),
+        rfiDyingGasp(153),
+        rfiCriticalAlarm(154),
+        noPower(155),
+        ftaOutOfDate(156),
+        cardNotFullyInserted(157),
+        voipLowSoftwareResources(158),
+        switchControlFault(159),
+        voipDown(160),
+        initialFlashWriteInProgress(161),
+        voipRegFail(162),
+        stackingRingHealthCompromised(163),
+        erpsDomainHealthCompromised(164),
+        controlVlanAuditFailure(165),
+        ontRfSignalBad(166),
+        interfaceQualityAuditFailure(167),
+        xdslPortProvFailure(168),
+        xdslGroupProvFailure(169),
+        xdslGroupLowRateDownstream(170),
+        xdslGroupLowRateUpstream(171),
+        xdslGroupLossOfSignal(172),
+        cardTypeDiffers(173),
+        cardHwFailure(174),
+        softwareInitializationInProgress(175),
+        stackingRingVlanProvError(176),
+        fastIgmpRingVlanProvError(177),
+        dosAttack(178),
+        ontUpgradeInProgress(179),
+        differentOntPackage(180),
+        deltInProgress(181),
+        seltInProgress(182),
+        ontConfigInProgress(183),
+        differentOntConfig(184),
+        ontUsSdber(185),
+        ontDsSdber(186),
+        ontRgConfigUnavailable(187),
+        h248MgToMgcAssocDown(188),
+        ontFileUpdateInProgress(189),
+        ont3pFileUpgradeInProgress(190),
+        differentOnt3pFile(191),
+        voiceHwInitFailure(192),
+        switchCriticalEvent(193),
+        voipDhcpFail(194),
+        potsCalibrationFailure(196),
+        dcVbattFailure(197),
+        improperConnectionOnStackingPort(195),
+        ontDyingGasp(200),
+        lowRxOptPowerNe(201),
+        highRxOptPowerNe(202),
+        lowTxOptPower(205),
+        highTxOptPower(206),
+        xdslVectoringProvFailure(213),
+        ontSelfTestFailed(214),
+        ontSipConfigUnavailable(216),
+		msgQueueOverflow(228),
+		voipMsgQueueOverflow(229),
+		ontYellowTemp(230),
+		ontRedTemp(231)
+    }
+
+E7EventType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 supported general events"
+    SYNTAX INTEGER {
+        none(0),
+        logInit(1),
+        upgradeHadErrors(2),
+        upgradeFailedToXferFiles(3),
+        upgradeFailedToRun(4),
+        resetInProgress(5),
+        resetSuccess(6),
+        resetHadErrors(7),
+        resetFailedToRun(8),
+        commitInProgress(9),
+        commitSuccess(10),
+        commitHadErrors(11),
+        commitFailedToCommit(12),
+        revertInProgress(13),
+        revertSuccess(14),
+        revertHadErrors(15),
+        revertFailedToRun(16),
+        revertFailedToCommit(17),
+        autoUpgrInProgress(18),
+        autoUpgrSuccess(19),
+        autoUpgrFailedToXferFiles(20),
+        autoUpgrFailedToRun(21),
+        autoUpgrFailedToCommit(22),
+        deleteUpgrInProgress(23),
+        deleteUpgrSuccess(24),
+        deleteUpgrHadErrors(25),
+        deleteUpgrFailed(26),
+        databaseRestoreInProgress(27),
+        databaseRestoreComplete(28),
+        databaseRestoreCompleteWithFailures(29),
+        vlanMacThresholdExceeded(30),
+        stpMemoryAllocationFailure(31),
+        stpBufferAllocationFailure(32),
+        stpNewRoot(33),
+        stpTopologyChange(34),
+        stpProtocolMigration(35),
+        stpInvalidBpdu(36),
+        stpNewPortRole(37),
+        erpsProtocolViolation(38),
+        erpsInvalidProvisioning(39),
+        timeSet(40),
+        databaseReset(41),
+        cancelUpgrInProgress(42),
+        cancelUpgrSuccess(43),
+        cancelUpgrHadErrors(44),
+        cancelUpgrFailed(45),
+        switchoverInProgress(46),
+        switchoverSuccess(47),
+        switchoverAborted(48),
+        unused49(49),
+        ontArrival(50),
+        ontDeparture(51),
+        ontDebugUpgrInProgress(52),
+        ontDebugUpgrSuccess(53),
+        ontDebugUpgrHadErrors(54),
+        ontDebugUpgrFailed(55),
+        ontPreArrival(56),
+        autoUpgrTooManyFailures(57),
+        cardArrival(58),
+        cardDeparture(59),
+        unused60(60),
+        ontLink(61),
+        ontUnlink(62),
+        rebootInProgress(63),
+        rebootSuccess(64),
+        rebootHadErrors(65),
+        rebootFailed(66),
+        cancelResetInProgress(67),
+        cancelResetSuccess(68),
+        stackingRingProtocolViolation(69),
+        stackingRingInvalidProvisioning(70),
+        unused71(71),
+        systemTimeSet(72),
+        cardMigrationUpgrade(73),
+        igmpGroupLimitReached(74),
+        aeOntDiscovered(75),
+        remoteLinkOamLoopbackStart(76),
+        remoteLinkOamLoopbackEnd(77),
+        localLinkOamLoopbackStart(78),
+        localLinkOamLoopbackEnd(79),
+        ontFileXferInProgress(80),
+        ontFileXferSuccess(81),
+        ontFileXferHadErrors(82),
+        ontFileXferFailed(83),
+        ontDownloadInProgress(84),
+        ontDownloadSuccess(85),
+        ontDownloadHadErrors(86),
+        ontDownloadFailed(87),
+        ontActivateInProgress(88),
+        ontActivateSuccess(89),
+        ontActivateHadErrors(90),
+        ontActivateFailed(91),
+        configFileXferInProgress(92),
+        configFileXferSuccess(93),
+        configFileXferHadErrors(94),
+        configFileXferFailed(95),
+        configFileApplyInProgress(96),
+        configFileApplySuccess(97),
+        configFileApplyHadErrors(98),
+        configFileApplyFailed(99),
+        ontFileCancelInProgress(100),
+        ontFileCancelSuccess(101),
+        ontFileCancelHadErrors(102),
+        ontFileCancelFailed(103),
+        ontFileRemoveInProgress(104),
+        ontFileRemoveSuccess(105),
+        ontFileRemoveHadErrors(106),
+        ontFileRemoveFailed(107),
+        ontUserReset(108),
+        lldpDelete(109),
+        lldpUpdate(110)
+        ontAutoQuarantine(111)
+    }
+
+E7SecurityType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 supported security events"
+    SYNTAX INTEGER {
+        none(0),
+        unused1(1),
+        userLogin(2),
+        userLogout(3),
+        inactiveLogout(4),
+        adminForcedLogout(5),
+        loginFailed(6),
+        alarmLogCleared(7),
+        dbChangeLogCleared(8),
+        eventLogCleared(9),
+        securityLogCleared(10),
+        tcaLogCleared(11),
+        unused12(12),
+        radiusLoginFailBadSecret(13),
+        databaseReset(14)
+    }
+
+E7TcaType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 supported tcas"
+    SYNTAX INTEGER {
+        cvC(2),
+        cvCFe(3),
+        fecC(4),
+        fecCFe(5),
+        fecL(6),
+        fecLFe(7),
+        esL(8),
+        esLFe(9),
+        sesL(10),
+        sesLFe(11),
+        lossL(12),
+        lossLFe(13),
+        uasL(14),
+        uasLFe(15),
+        initL(16),
+        lInitL(17),
+        crcP(18),
+        cvP(19),
+        inErrors(43),
+        inDiscards(44),
+        fcsErr(61),
+        exColl(62),
+        lateColl(63),
+        longFrame(64),
+        rxBufOvfl(65),
+        txBufOvfl(66),
+        snglColl(67),
+        multColl(68),
+        sqe(69),
+        deferredTx(70),
+        macTxErr(71),
+        carSenseErr(72),
+        alignErr(73),
+        macRxErr(74),
+        errSec(75),
+        sevErrSec(76),
+        burstySec(77),
+        unavailSec(78),
+        rxCtrlSlipSec(79),
+        missingPkts(88),
+        misorderUsable(89),
+        misorderDropped(90),
+        bufferUnderOverrun(91),
+        malformedPkts(92),
+        strayPkts(93),
+        mmtPktLoss(94),
+        tdmLbitPktsSent(95)
+    }
+
+E7ObjectClass ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION
+        "Object class reported in the traps and AlarmTable"
+    SYNTAX INTEGER {
+        invalid(0),
+        system(1),
+        card(2),
+        dhcpGlobal(3),
+        ethPortAny(4),
+        opt82Prof(5),
+        vlan(6),
+        sshKeyOld(7),
+        chassis(8),
+        shelf(9),
+        db(10),
+        snmpTrapDest(11),
+        envPin(12),
+        snmpCommunity(13),
+        rstpConfig(14),
+        craftUser(15),
+        igmpGroup(16),
+        craftSerial(17),
+        craftFe(18),
+        ponPort(19),
+        ontEthMcastProf(20),
+        ontEthStaticIp(21),
+        fanTray(22),
+        igmpMember(23),
+        portMonitor(24),
+        monitorSource(25),
+        dscpMap(26),
+        mgmtConfig(27),
+        igmpConfig(28),
+        ntp(29),
+        macTableEntry(30),
+        ontEthSvc(31),
+        ontEthTagAction(32),
+        ontEthBwProf(33),
+        ontEthSecuProf(34),
+        cos(35),
+        ethStudy(36),
+        erps(37),
+        snmpUser(38),
+        notfLogIndex(39),
+        snmpConfig(40),
+        potPortCos(41),
+        l2CtrlProfile(42),
+        l2Acl(43),
+        l2AclRule(44),
+        ethGePort(45),
+        eth10GePort(46),
+        vlanMember(47),
+        tagAction(48),
+        ponCosConfig(49),
+        policyMap(50),
+        policy(51),
+        classMap(52),
+        classRule(53),
+        acl(54),
+        aclRule(55),
+        l3Acl(56),
+        l3AclRule(57),
+        ethPortGos(58),
+        ontFEth(59),
+        ethIntf(60),
+        lagIntf(61),
+        intfAny(62),
+        ont(63),
+        ontSlot(64),
+        ontGigEth(65),
+        ontHpnaEth(66),
+        ontEthAny(67),
+        ontRfVideo(68),
+        ontHotRfVideo(69),
+        ontVideoAny(70),
+        ontPots(71),
+        ontDs1(72),
+        ontPortAny(73),
+        ontProfile(74),   
+        macTableCount(75),
+        ontSipSvc(76),
+        sipProfile(77),
+        mcastAddrRange(78),
+        mvrProfile(79),
+        ontIpHost(80),
+        discOnt(81),
+        quarnatineOnt(82),
+        ontEthSvcName(83),
+        ontEthGos(84),
+        ontDs1Gos(85),
+        ontCsipSvc(86),
+        csipProfile(87),
+        ontPwe3Svc(88),
+        ontPwe3Profile(89),
+        ds1Pwe3Profile(90),
+        bpVlanMap(91),
+        ontMatchList(92),
+        ontMatchRuleTagged(93),
+        ontMatchRuleUntagged(94),
+        timing(95),
+        timingSrc(96),
+        ontPwe3Gos(97),
+        igmpIntfAny(98),
+        sshKey(99),
+        ontMgmt(100),
+        ontRfAvo(101),
+        radiusCfg(102),
+        radiusAuthServer(103),
+        radiusAcctServer(104),
+        mcastFilter(105),
+        syslog(106),
+        mvrVlan(107),
+        unused108(108),
+        unused109(109),
+        ethOamCfg(110),
+        ethOamPmProfile(111),
+        ethOamMeg(112),
+        ethOamMep(113),
+        ethOamMip(114),
+        ethOamRemoteMep(115),
+        igmpRouterPort(116),
+        vlanIgmpProfile(117),
+        h248MediaGwProfile(118),
+        ontH248Svc(119),
+        unused120(120),
+        unused121(121),
+        unused122(122),
+        unused123(123),
+        unused124(124),
+        unused125(125),
+        unused126(126),
+        unused127(127),
+        unused128(128),
+        backplane10GePort(129),
+        unused130(130),
+        unused131(131),
+        unused132(132),
+        l2cpRange(133),
+        l2cpFilter(134),
+        powerInput(135),
+        lcPots(136),
+        lcIpHost(137),
+        vdslPort(138),
+        vdslBondedIntf(139),
+        lcH248Svc(140),
+        lcSipSvc(141),
+        lcTdmGwSvc(142),
+        unused143(143),
+        vdslPortTemplate(144),
+        vdslPortTemplateData(145),
+        vdslPortTemplateMask(146),
+        vdslPortGos(147),
+        ethIntfEthSvc(148),
+        ethIntfEthSvcStaticIp(149),
+        bondedIntfEthSvc(150),
+        bondedIntfEthSvcStaticIp(151),
+        pppoeProf(152),
+        dialPlan(153),
+        dialPlanRule(154),
+        unused155(155),
+        unused156(156),
+        unused157(157),
+        sipGwProf(158),
+        ontMgcpSvc(159),
+        mgcpMediaGwProf(160),
+        ipPrecMap(161),
+        avoCfg(162),
+        unused163(163),
+        unused164(164),
+        ontRg(165),
+        ontFb(166),
+        ontPonUsCos(167),
+        macFilter(168),
+        macFilterRule(169),
+        unused170(170),
+        unused171(171),
+        ponUsCosProf(172),
+        lcH248Gw(173),
+        lcMgcpGw(174),
+        ontRgMgmtProf(175),
+        unused176(176),
+        unused177(177),
+        unused178(178),
+        unused179(179),
+        unused180(180),
+        unused181(181),
+        unused182(182),
+        unused183(183),
+        unused184(184),
+        vdslVectorGrp(185),
+        unused186(186)
+    }
+
+-- the following items are for the future E7-Calix MIB
+E7AdminStatus ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "administrative status values"
+    SYNTAX INTEGER {
+        unknown(0),
+        enabled(1),
+		alarmsuppress(2),
+        disabled(3)
+    }
+
+E7CardType ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 card types"
+    SYNTAX INTEGER {
+        none(0),
+        unknown(1),
+		agg(1012),              -- E5400 card
+		backplaneE5400(1013),
+		backplaneE7x2SlotChassis1RU(1014),
+		fantrayE5400(1015),
+        fantrayE7x2SlotChassis1RU(1016),
+        gpon4(1017),
+        activeEthernet(1018),   -- E5312 card
+        backplaneE5312(1019),
+        tenge4(1020),           -- 10ge-4, leading digits not always accepted
+        backplaneE7x2S0lotChassis(1021),
+        fantrayE7x20SlotChassis(1022),
+        ge12(1023),
+        scp(1026),
+        ge24(1027),
+        gpon4x(1029),
+        ge24x(1030),
+        vdsl48c(1031),
+        vdsl48(1032),
+        gpon4r2(1036),
+        gpon8(1037),
+        gpon8x(1038),
+        e348c(1040),
+        backplaneE348C(1041),
+        fantrayE7x2SlotChassis1RU2(1045),
+        vdsl48c(1046),
+        fantrayE5Fta2(2000),
+        e548c(2001),
+        e548(2003),
+        backplaneE5(2005)
+    }
+
+E7PowerLevel ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "Power level for card"
+    SYNTAX INTEGER {
+        notSet(0),
+        powerLevelLow(1),
+        powerLevel2(2),
+        powerLevel3(3),
+        powerLevel4(4),
+        powerLevelFull(5)
+    }
+
+E7SnmpVers ::= TEXTUAL-CONVENTION
+    STATUS current
+    DESCRIPTION "E7 snmp versions (for trap destinations)"
+    SYNTAX INTEGER {
+        unknown(0),
+        v2c(2),
+        v3(3)
+    }
+
+END
+

From 6f31755dfb6d38df2669635dc579ffff0b96bcc9 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 5 Feb 2016 18:14:44 -0600
Subject: [PATCH 3/6] Use poll_device; List the inserted cards in "features".

---
 includes/polling/os/calix.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
index 610448189..c4e22dca4 100644
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -1,4 +1,5 @@
 <?php
 // Device might not have a card 1 (or even card2 if it is an E7-20)
 $version = trim(strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL),'"');
-$hardware = "Calix " . trim(snmp_get($device, "sysDescr.0", "-OQv"),'"');
+$hardware = "Calix " . $poll_device['sysDescr'];
+$features = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardProvType", "-OQv", "E7-Calix-MIB"));

From 799bb4dc5d5f351dfb2a60a7578a747e5983991d Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 8 Feb 2016 10:29:55 -0600
Subject: [PATCH 4/6] Pull card serial numbers.  Unsure if this what we want.
 Set ifName as the primary port name.

---
 includes/definitions.inc.php      | 1 +
 includes/polling/os/calix.inc.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 0b3d08490..0d3ffc2e2 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -315,6 +315,7 @@ $config['os'][$os]['over'][0]['text']  = 'Traffic';
 $os = 'calix';
 $config['os'][$os]['text']             = 'Calix E7';
 $config['os'][$os]['type']             = 'network';
+$config['os'][$os]['ifname']           = 1;
 $config['os'][$os]['icon']             = 'calix';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
index c4e22dca4..638d13941 100644
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -1,5 +1,6 @@
 <?php
 // Device might not have a card 1 (or even card2 if it is an E7-20)
-$version = trim(strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL),'"');
+$version = strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL);
 $hardware = "Calix " . $poll_device['sysDescr'];
 $features = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardProvType", "-OQv", "E7-Calix-MIB"));
+$serial = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardSerialNumber", "-OQv", "E7-Calix-MIB"));

From 1d796fecfe1f69f1f995275f7a26c5d0c635f0dd Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 8 Feb 2016 13:58:03 -0600
Subject: [PATCH 5/6] Add a generic way to allow empty ifDescr on ports for an
 OS.

---
 includes/definitions.inc.php | 1 +
 includes/functions.php       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 0d3ffc2e2..7b874be86 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -316,6 +316,7 @@ $os = 'calix';
 $config['os'][$os]['text']             = 'Calix E7';
 $config['os'][$os]['type']             = 'network';
 $config['os'][$os]['ifname']           = 1;
+$config['os'][$os]['empty_ifdescr']    = 1;
 $config['os'][$os]['icon']             = 'calix';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
diff --git a/includes/functions.php b/includes/functions.php
index 883bccc65..f5949aae3 100644
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -895,7 +895,7 @@ function is_port_valid($port, $device) {
                 }
             }
         }
-        if (empty($port['ifDescr']) && !$device['os'] == "calix") {
+        if (empty($port['ifDescr']) && !$config['os'][$device['os']]['empty_ifdescr']) {
             $valid = 0;
         }
         if ($device['os'] == "catos" && strstr($if, "vlan")) {

From 17fe1d1f66a19d79d49f96db62c588039627b26f Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 8 Feb 2016 15:01:25 -0600
Subject: [PATCH 6/6] I could not find cpu info in Calix MIBs.  Just load in
 hr.

---
 includes/definitions.inc.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 7b874be86..6013d2caa 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -320,8 +320,6 @@ $config['os'][$os]['empty_ifdescr']    = 1;
 $config['os'][$os]['icon']             = 'calix';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
-$config['os'][$os]['over'][1]['graph'] = 'device_processor';
-$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
 
 // Cisco OSes
 $os = 'ios';