L2VPN changes

src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml

@@ -14,7 +14,11 @@
         <config>
           <index>{{index}}</index>
           <description>{{description}}</description>
+        {% if vlan_id is not defined %}
+          <untagged-allowed xmlns="http://www.advaoptical.com/cim/adva-dnos-oc-interfaces">true</untagged-allowed>
+          {% endif%}
         </config>
+        {% if vlan_id is defined %}
         <vlan xmlns="http://openconfig.net/yang/vlan">
           <match>
             <single-tagged>
@@ -24,6 +28,7 @@
             </single-tagged>
           </match>
         </vlan>
+        {% endif%}
         {% if address_ip is defined %}
         <oc-ip:ipv4>
           <oc-ip:addresses>

src/device/service/drivers/openconfig/templates/network_instance/edit_config.xml

@@ -20,7 +20,7 @@
             {% endif %}
             {% if type=='L2VSI' %}
             {% if description is defined %}<description>{{description}}</description>{% endif %}
-            <enabled>false</enabled>
+            <enabled>true</enabled>
             <mtu>1500</mtu>
         </config>
         <encapsulation>