Skip to content
This repository has been archived by the owner on Oct 2, 2024. It is now read-only.

Commit

Permalink
Fixes to IOS, IOS-XE
Browse files Browse the repository at this point in the history 
Re-established backwards compatibility with recent datatype changes.
  • Loading branch information
David Rothenberg committed Apr 9, 2015
1 parent 0a99e17 commit de53c4c
Show file tree
Hide file tree
Showing 4 changed files with 128 additions and 14 deletions.
34 changes: 31 additions & 3 deletions schemas/ios-definitions-schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<xsd:appinfo>
<schema>IOS Definition</schema>
<version>5.11.1:1.1</version>
<date>3/30/2015 09:00:00 AM</date>
<date>4/13/2015 09:00:00 AM</date>
<terms_of_use>Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included.</terms_of_use>
<sch:ns prefix="oval-def" uri="http://oval.mitre.org/XMLSchema/oval-definitions-5"/>
<sch:ns prefix="ios-def" uri="http://oval.mitre.org/XMLSchema/oval-definitions-5#ios"/>
Expand Down Expand Up @@ -556,15 +556,43 @@
<xsd:documentation>The switchport mode option configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="switchport_native_vlan" type="oval-def:EntityStateIntType" minOccurs="0" maxOccurs="1">
<xsd:element name="switchport_native_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>The trunk native vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-def:EntityStateAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_access_vlan" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:element name="switchport_access_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>The access vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-def:EntityStateAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_trunked_vlans" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
Expand Down
34 changes: 31 additions & 3 deletions schemas/ios-system-characteristics-schema.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<xsd:appinfo>
<schema>IOS System Characteristics</schema>
<version>5.11.1:1.1</version>
<date>3/30/2015 09:00:00 AM</date>
<date>4/13/2015 09:00:00 AM</date>
<terms_of_use>Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included.</terms_of_use>
<sch:ns prefix="oval-sc" uri="http://oval.mitre.org/XMLSchema/oval-system-characteristics-5"/>
<sch:ns prefix="ios-sc" uri="http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#ios"/>
Expand Down Expand Up @@ -269,15 +269,43 @@
<xsd:documentation>Element with the switchport mode option configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="switchport_native_vlan" type="oval-sc:EntityItemIntType" minOccurs="0" maxOccurs="1">
<xsd:element name="switchport_native_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Element with the trunk native vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-sc:EntityItemAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_access_vlan" type="oval-sc:EntityItemStringType" minOccurs="0" maxOccurs="1">
<xsd:element name="switchport_access_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>Element with the access vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-sc:EntityItemAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_trunked_vlans" type="oval-sc:EntityItemStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
Expand Down
37 changes: 33 additions & 4 deletions schemas/iosxe-definitions-schema.xsd
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:oval="http://oval.mitre.org/XMLSchema/oval-common-5" xmlns:oval-def="http://oval.mitre.org/XMLSchema/oval-definitions-5" xmlns:iosxe-def="http://oval.mitre.org/XMLSchema/oval-definitions-5#iosxe" xmlns:sch="http://purl.oclc.org/dsdl/schematron" targetNamespace="http://oval.mitre.org/XMLSchema/oval-definitions-5#iosxe" elementFormDefault="qualified" version="5.11">
<xsd:import namespace="http://oval.mitre.org/XMLSchema/oval-definitions-5" schemaLocation="oval-definitions-schema.xsd"/>
<xsd:import namespace="http://oval.mitre.org/XMLSchema/oval-common-5" schemaLocation="oval-common-schema.xsd"/>
<xsd:annotation>
<xsd:documentation>The following is a description of the elements, types, and attributes that compose the IOS-XE specific tests found in Open Vulnerability and Assessment Language (OVAL). Each test is an extension of the standard test element defined in the Core Definition Schema. Through extension, each test inherits a set of elements and attributes that are shared amongst all OVAL tests. Each test is described in detail and should provide the information necessary to understand what each element and attribute represents. This document is intended for developers and assumes some familiarity with XML. A high level description of the interaction between the different tests and their relationship to the Core Definition Schema is not outlined here.</xsd:documentation>
<xsd:documentation>The OVAL Schema is maintained by The MITRE Corporation and developed by the public OVAL Community. For more information, including how to get involved in the project and how to submit change requests, please visit the OVAL website at http://oval.mitre.org.</xsd:documentation>
<xsd:documentation>Thanks to Omar Santos and Panos Kampanakis of Cisco for providing this test.</xsd:documentation>
<xsd:appinfo>
<schema>IOS-XE Definition</schema>
<version>5.11.1:1.1</version>
<date>3/30/2015 09:00:00 AM</date>
<date>4/13/2015 09:00:00 AM</date>
<terms_of_use>Copyright (c) 2002-2015, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the OVAL License located at http://oval.mitre.org/oval/about/termsofuse.html. See the OVAL License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the OVAL Schema, this license header must be included.</terms_of_use>
<sch:ns prefix="oval-def" uri="http://oval.mitre.org/XMLSchema/oval-definitions-5"/>
<sch:ns prefix="iosxe-def" uri="http://oval.mitre.org/XMLSchema/oval-definitions-5#iosxe"/>
Expand Down Expand Up @@ -457,15 +458,43 @@
<xsd:documentation>The switchport mode option configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="switchport_native_vlan" type="oval-def:EntityStateIntType" minOccurs="0" maxOccurs="1">
<xsd:element name="switchport_native_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>The trunk native vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
</xsd:element>
<xsd:element name="switchport_access_vlan" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-def:EntityStateAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_access_vlan" minOccurs="0" maxOccurs="1">
<xsd:annotation>
<xsd:documentation>The access vlan configured on the interface (if applicable).</xsd:documentation>
</xsd:annotation>
<xsd:complexType>
<xsd:simpleContent>
<xsd:restriction base="oval-def:EntityStateAnySimpleType">
<xsd:attribute name="datatype" use="optional" default="string">
<xsd:simpleType>
<xsd:restriction base="oval:SimpleDatatypeEnumeration">
<xsd:enumeration value="string"/>
<xsd:enumeration value="int"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:attribute>
</xsd:restriction>
</xsd:simpleContent>
</xsd:complexType>
</xsd:element>
<xsd:element name="switchport_trunked_vlans" type="oval-def:EntityStateStringType" minOccurs="0" maxOccurs="1">
<xsd:annotation>
Expand Down
Loading

0 comments on commit de53c4c

Please sign in to comment.