missing the "labeltype" attribute from the SwitchingService

[xi-yang]

From John MacAuley:

 I noticed the version of NML OWL you are using is missing the "labeltype" attribute from the SwitchingService.  We added this into the XSD last year to address a problem I believe you are trying to solve via the encoding type.  Your switching service should appears as follows:

<urn:ogf:network:openstack.com:openstack-cloud:ucs-fabric>
    a <http://schemas.ogf.org/nml/2013/03/base#SwitchingService>;
    <http://schemas.ogf.org/mrs/2013/12/topology#providesSubnet>
        <urn:ogf:network:openstack.com:openstack-cloud:port-profile+AWS-DC-1>,
        <urn:ogf:network:openstack.com:openstack-cloud:port-profile+AWS-DC-3>,
        <urn:ogf:network:openstack.com:openstack-cloud:port-profile+AWS-DC-2>,
        <urn:ogf:network:openstack.com:openstack-cloud:port-profile+MSX-Data-Remote>;
    <http://schemas.ogf.org/nml/2013/03/base#encoding> <http://schemas.ogf.org/nml/2012/10/ethernet>;
    <http://schemas.ogf.org/nml/2013/03/base#labeltype> <http://schemas.ogf.org/nml/2012/10/ethernet#vlan>;
    <http://schemas.ogf.org/nml/2013/03/base#hasBidirectionalPort>
        <urn:ogf:network:openstack.com:openstack-cloud:host+msx2:sriov-pf>,
        <urn:ogf:network:openstack.com:openstack-cloud:ucs-tor-sw:10g-dc>,
        <urn:ogf:network:openstack.com:openstack-cloud:host+msx3:sriov-pf>,
        <urn:ogf:network:openstack.com:openstack-cloud:host+msx4:sriov-pf>,
        <urn:ogf:network:openstack.com:openstack-cloud:host+msx1:sriov-pf>;
    <http://schemas.ogf.org/nml/2013/03/base#labelSwapping> false .

encoding is "http://schemas.ogf.org/nml/2012/10/ethernet" and labeltype is "http://schemas.ogf.org/nml/2012/10/ethernet#vlan".  This allows us to separate the encoding of the payload from the label being switched.

I believe the following change to the labeltype definition in the NML OWL schema will fix this:

    <!-- http://schemas.ogf.org/nml/2013/03/base#labeltype -->

    <owl:ObjectProperty rdf:about="http://schemas.ogf.org/nml/2013/03/base#labeltype">
        <rdfs:domain>
            <owl:Class>
                <owl:unionOf rdf:parseType="Collection">
                    <rdf:Description rdf:about="http://schemas.ogf.org/nml/2013/03/base#Label"/>
                    <rdf:Description rdf:about="http://schemas.ogf.org/nml/2013/03/base#LabelGroup"/>
                    <rdf:Description rdf:about="http://schemas.ogf.org/nml/2013/03/base#SwitchingService"/>
                </owl:unionOf>
            </owl:Class>
        </rdfs:domain>
    </owl:ObjectProperty>