OS-200 need a better mechanism for storing persistent zone_did
OS-511 make zonecfg device resource extensible, like the net resource
OS-224 add more zonecfg net properties
OS-216 store all net config info on zone

*** 23,32 ****
--- 23,33 ----
   information: Portions Copyright [yyyy] [name of copyright owner]
  
   CDDL HEADER END
  
   Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2011, Joyent Inc. All rights reserved.
  
  -->
  
  <!--Element Definitions-->
  
*** 45,60 ****
  
  <!ELEMENT inherited-pkg-dir   EMPTY>
  
  <!ATTLIST inherited-pkg-dir   directory CDATA #REQUIRED>
  
! <!ELEMENT network   EMPTY>
  
  <!ATTLIST network   address        CDATA ""            allowed-address
!      CDATA ""            defrouter CDATA ""            physical  CDATA #REQUIRED>
  
! <!ELEMENT device    EMPTY>
  
  <!ATTLIST device    match          CDATA #REQUIRED>
  
  <!--      Historically, the deleted-device element denoted a used-to-be
       device element.  This was used to keep track of device elements  deleted or
--- 46,66 ----
  
  <!ELEMENT inherited-pkg-dir   EMPTY>
  
  <!ATTLIST inherited-pkg-dir   directory CDATA #REQUIRED>
  
! <!ELEMENT net-attr  EMPTY> <!ATTLIST net-attr     name      CDATA #REQUIRED
!                value          CDATA #REQUIRED>
  
+ <!ELEMENT network   (net-attr)*>
+ 
  <!ATTLIST network   address        CDATA ""            allowed-address
!      CDATA ""            defrouter CDATA ""            global-nic     CDATA ""
!                mac-addr  CDATA ""            physical  CDATA #REQUIRED               vlan-id
!           CDATA "">
  
! <!ELEMENT device    (net-attr)*>
  
  <!ATTLIST device    match          CDATA #REQUIRED>
  
  <!--      Historically, the deleted-device element denoted a used-to-be
       device element.  This was used to keep track of device elements  deleted or
*** 136,146 ****
  
  <!ATTLIST zone      name      CDATA #REQUIRED               zonepath  CDATA
  #REQUIRED                autoboot  (true | false) #REQUIRED                ip-
  type      CDATA ""            hostid         CDATA ""            pool
            CDATA ""            limitpriv CDATA ""            bootargs  CDATA ""
!                brand          CDATA ""            scheduling-class    CDATA ""            fs-
! allowed   CDATA ""            version        NMTOKEN #FIXED '1'>
  
  
  
                                  October 5, 2016                             ()
--- 142,153 ----
  
  <!ATTLIST zone      name      CDATA #REQUIRED               zonepath  CDATA
  #REQUIRED                autoboot  (true | false) #REQUIRED                ip-
  type      CDATA ""            hostid         CDATA ""            pool
            CDATA ""            limitpriv CDATA ""            bootargs  CDATA ""
!                brand          CDATA ""            debugid        CDATA ""
!                scheduling-class    CDATA ""            fs-allowed     CDATA ""
!                version        NMTOKEN #FIXED '1'>
  
  
  
                                  October 5, 2016                             ()