OS-224 add more zonecfg net properties
OS-216 store all net config info on zone

@@ -134,20 +134,21 @@
 %token IPTYPE HOSTID FS_ALLOWED ALLOWED_ADDRESS
 %token NAME MATCH PRIV LIMIT ACTION VALUE EQUAL OPEN_SQ_BRACKET CLOSE_SQ_BRACKET
 %token OPEN_PAREN CLOSE_PAREN COMMA DATASET LIMITPRIV BOOTARGS BRAND PSET PCAP
 %token MCAP NCPUS IMPORTANCE SHARES MAXLWPS MAXSHMMEM MAXSHMIDS MAXMSGIDS
 %token MAXSEMIDS LOCKED SWAP SCHED CLEAR DEFROUTER ADMIN USER AUTHS MAXPROCS
+%token ZFSPRI MAC VLANID GNIC NPROP
 
 %type <strval> TOKEN EQUAL OPEN_SQ_BRACKET CLOSE_SQ_BRACKET
     property_value OPEN_PAREN CLOSE_PAREN COMMA simple_prop_val
 %type <complex> complex_piece complex_prop_val
 %type <ival> resource_type NET FS DEVICE RCTL ATTR DATASET PSET PCAP MCAP
     ADMIN
 %type <ival> property_name SPECIAL RAW DIR OPTIONS TYPE ADDRESS PHYSICAL NAME
     MATCH ZONENAME ZONEPATH AUTOBOOT POOL LIMITPRIV BOOTARGS VALUE PRIV LIMIT
     ACTION BRAND SCHED IPTYPE DEFROUTER HOSTID USER AUTHS FS_ALLOWED
-    ALLOWED_ADDRESS
+    ALLOWED_ADDRESS MAC VLANID GNIC NPROP
 %type <cmd> command
 %type <cmd> add_command ADD
 %type <cmd> cancel_command CANCEL
 %type <cmd> commit_command COMMIT
 %type <cmd> create_command CREATE

@@ -974,10 +975,14 @@
         | BOOTARGS      { $$ = PT_BOOTARGS; }
         | ADDRESS       { $$ = PT_ADDRESS; }
         | ALLOWED_ADDRESS       { $$ = PT_ALLOWED_ADDRESS; }
         | PHYSICAL      { $$ = PT_PHYSICAL; }
         | DEFROUTER     { $$ = PT_DEFROUTER; }
+        | MAC           { $$ = PT_MAC; }
+        | VLANID        { $$ = PT_VLANID; }
+        | GNIC          { $$ = PT_GNIC; }
+        | NPROP         { $$ = PT_NPROP; }
         | NAME          { $$ = PT_NAME; }
         | VALUE         { $$ = PT_VALUE; }
         | MATCH         { $$ = PT_MATCH; }
         | PRIV          { $$ = PT_PRIV; }
         | LIMIT         { $$ = PT_LIMIT; }