Merge "Schema changes for bare metal servers"

Juniper · Sep 23, 2014 · fb4baff · fb4baff
2 parents ea5c422 + 84d7d16
commit fb4baff
Showing 1 changed file with 27 additions and 0 deletions.
diff --git a/src/schema/vnc_cfg.xsd b/src/schema/vnc_cfg.xsd
@@ -950,11 +950,33 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0">
      Link('global-system-config-physical-router', 
              'global-system-config', 'physical-router', ['has']) -->
 
+<xsd:simpleType name="VirtualRouterType">
+    <xsd:restriction base="xsd:string">
+        <xsd:enumeration value="embedded"/>
+        <xsd:enumeration value="tor-agent"/>
+        <xsd:enumeration value="tor-service-node"/>
+    </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:element name="virtual-router-type" type="VirtualRouterType"/>
+<!--#IFMAP-SEMANTICS-IDL
+     Property('virtual-router-type', 'virtual-router') -->
+
+<xsd:element name="physical-router-virtual-router"/>
+<!--#IFMAP-SEMANTICS-IDL
+    Link('physical-router-virtual-router',
+         'physical-router', 'virtual-router', ['ref']) -->
+
 <xsd:element name="physical-router-bgp-router"/>
 <!--#IFMAP-SEMANTICS-IDL 
     Link('physical-router-bgp-router',
          'physical-router', 'bgp-router', ['ref']) -->
 
+<xsd:element name="physical-router-virtual-network"/>
+<!--#IFMAP-SEMANTICS-IDL
+    Link('physical-router-virtual-network',
+         'physical-router', 'virtual-network', ['ref']) -->
+
 <xsd:element name="physical-interface" type="ifmap:IdentityType"/>
 <xsd:element name="physical-router-physical-interface"/>
 <!--#IFMAP-SEMANTICS-IDL 
@@ -971,6 +993,11 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0">
      Link('logical-interface-virtual-network',
           'logical-interface', 'virtual-network', ['ref']) -->
 
+<xsd:element name="logical-interface-virtual-machine-interface"/>
+<!--#IFMAP-SEMANTICS-IDL
+     Link('logical-interface-virtual-machine-interface',
+          'logical-interface', 'virtual-machine-interface', ['ref']) -->
+
 <xsd:element name="virtual-router" type="ifmap:IdentityType"/>
 <xsd:element name="global-system-config-virtual-router"/>
 <!--#IFMAP-SEMANTICS-IDL