draft-ietf-lmap-yang-02.txt   draft-ietf-lmap-yang-03.txt 
Network Working Group J. Schoenwaelder Network Working Group J. Schoenwaelder
Internet-Draft V. Bajpai Internet-Draft V. Bajpai
Intended status: Standards Track Jacobs University Bremen Intended status: Standards Track Jacobs University Bremen
Expires: May 4, 2016 November 1, 2015 Expires: September 16, 2016 March 15, 2016
A YANG Data Model for LMAP Measurement Agents A YANG Data Model for LMAP Measurement Agents
draft-ietf-lmap-yang-02.txt draft-ietf-lmap-yang-03.txt
Abstract Abstract
This document defines a data model for Large-Scale Measurement This document defines a data model for Large-Scale Measurement
Platforms (LMAP). The data model is defined using the YANG data Platforms (LMAP). The data model is defined using the YANG data
modeling language. modeling language.
Status of This Memo Status of This Memo
This Internet-Draft is submitted in full conformance with the This Internet-Draft is submitted in full conformance with the
skipping to change at page 1, line 32 skipping to change at page 1, line 32
Internet-Drafts are working documents of the Internet Engineering Internet-Drafts are working documents of the Internet Engineering
Task Force (IETF). Note that other groups may also distribute Task Force (IETF). Note that other groups may also distribute
working documents as Internet-Drafts. The list of current Internet- working documents as Internet-Drafts. The list of current Internet-
Drafts is at http://datatracker.ietf.org/drafts/current/. Drafts is at http://datatracker.ietf.org/drafts/current/.
Internet-Drafts are draft documents valid for a maximum of six months Internet-Drafts are draft documents valid for a maximum of six months
and may be updated, replaced, or obsoleted by other documents at any and may be updated, replaced, or obsoleted by other documents at any
time. It is inappropriate to use Internet-Drafts as reference time. It is inappropriate to use Internet-Drafts as reference
material or to cite them other than as "work in progress." material or to cite them other than as "work in progress."
This Internet-Draft will expire on May 4, 2016. This Internet-Draft will expire on September 16, 2016.
Copyright Notice Copyright Notice
Copyright (c) 2015 IETF Trust and the persons identified as the Copyright (c) 2016 IETF Trust and the persons identified as the
document authors. All rights reserved. document authors. All rights reserved.
This document is subject to BCP 78 and the IETF Trust's Legal This document is subject to BCP 78 and the IETF Trust's Legal
Provisions Relating to IETF Documents Provisions Relating to IETF Documents
(http://trustee.ietf.org/license-info) in effect on the date of (http://trustee.ietf.org/license-info) in effect on the date of
publication of this document. Please review these documents publication of this document. Please review these documents
carefully, as they describe your rights and restrictions with respect carefully, as they describe your rights and restrictions with respect
to this document. Code Components extracted from this document must to this document. Code Components extracted from this document must
include Simplified BSD License text as described in Section 4.e of include Simplified BSD License text as described in Section 4.e of
the Trust Legal Provisions and are provided without warranty as the Trust Legal Provisions and are provided without warranty as
described in the Simplified BSD License. described in the Simplified BSD License.
Table of Contents Table of Contents
1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2 1. Introduction . . . . . . . . . . . . . . . . . . . . . . . . 2
1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 2 1.1. Terminology . . . . . . . . . . . . . . . . . . . . . . . 2
1.2. Tree Diagrams . . . . . . . . . . . . . . . . . . . . . . 2 1.2. Tree Diagrams . . . . . . . . . . . . . . . . . . . . . . 3
2. Data Model Overview . . . . . . . . . . . . . . . . . . . . . 3 2. Data Model Overview . . . . . . . . . . . . . . . . . . . . . 3
3. Relationship to the Information Model . . . . . . . . . . . . 6 3. Relationship to the Information Model . . . . . . . . . . . . 7
4. YANG Modules . . . . . . . . . . . . . . . . . . . . . . . . 7 4. YANG Modules . . . . . . . . . . . . . . . . . . . . . . . . 8
5. Security Considerations . . . . . . . . . . . . . . . . . . . 33 5. Security Considerations . . . . . . . . . . . . . . . . . . . 41
6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 33 6. IANA Considerations . . . . . . . . . . . . . . . . . . . . . 43
7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 34 7. Acknowledgements . . . . . . . . . . . . . . . . . . . . . . 44
8. References . . . . . . . . . . . . . . . . . . . . . . . . . 34 8. References . . . . . . . . . . . . . . . . . . . . . . . . . 44
8.1. Normative References . . . . . . . . . . . . . . . . . . 34 8.1. Normative References . . . . . . . . . . . . . . . . . . 44
8.2. Informative References . . . . . . . . . . . . . . . . . 35 8.2. Informative References . . . . . . . . . . . . . . . . . 45
Appendix A. Open Issues . . . . . . . . . . . . . . . . . . . . 35 Appendix A. Open Issues . . . . . . . . . . . . . . . . . . . . 46
Appendix B. Non-editorial Changes since -01 . . . . . . . . . . 36 A.1. Purpose of /lmap-state/tasks . . . . . . . . . . . . . . 46
Appendix C. Non-editorial Changes since -00 . . . . . . . . . . 36 A.2. Streamline the reporting model . . . . . . . . . . . . . 46
Appendix D. Example Configuration (XML) . . . . . . . . . . . . 37 Appendix B. Non-editorial Changes since -02 . . . . . . . . . . 46
Appendix E. Example Configuration (JSON) . . . . . . . . . . . . 40 Appendix C. Non-editorial Changes since -01 . . . . . . . . . . 47
Appendix F. Example State (XML) . . . . . . . . . . . . . . . . 44 Appendix D. Non-editorial Changes since -00 . . . . . . . . . . 47
Appendix G. Example State (JSON) . . . . . . . . . . . . . . . . 45 Appendix E. Example IPPM Module for UDP Latency Metrics . . . . 48
Appendix H. Example Report (XML) . . . . . . . . . . . . . . . . 47 Appendix F. Example Configuration (XML) . . . . . . . . . . . . 49
Appendix I. Example Report (JSON) . . . . . . . . . . . . . . . 50 Appendix G. Example Configuration (JSON) . . . . . . . . . . . . 56
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 54 Appendix H. Example State (XML) . . . . . . . . . . . . . . . . 65
Appendix I. Example State (JSON) . . . . . . . . . . . . . . . . 66
Appendix J. Example Report (XML) . . . . . . . . . . . . . . . . 68
Appendix K. Example Report (JSON) . . . . . . . . . . . . . . . 71
Authors' Addresses . . . . . . . . . . . . . . . . . . . . . . . 75
1. Introduction 1. Introduction
This document defines a data model for Large-Scale Measurement This document defines a data model for Large-Scale Measurement
Platforms (LMAP) [RFC7594]. The data model is defined using the YANG Platforms (LMAP) [RFC7594]. The data model is defined using the YANG
[RFC6020] data modeling language. It aims to be consistent with the [RFC6020] data modeling language. It aims to be consistent with the
LMAP Information Model [I-D.ietf-lmap-information-model]. LMAP Information Model [I-D.ietf-lmap-information-model].
1.1. Terminology 1.1. Terminology
skipping to change at page 3, line 23 skipping to change at page 3, line 31
marked with a colon (":"). marked with a colon (":").
o Ellipsis ("...") stands for contents of subtrees that are not o Ellipsis ("...") stands for contents of subtrees that are not
shown. shown.
2. Data Model Overview 2. Data Model Overview
The tree diagram below shows the structure of the configuration data The tree diagram below shows the structure of the configuration data
model. model.
module: ietf-lmap-control module: ietf-lmap-control
+--rw lmap +--rw lmap
+--rw agent +--rw agent
| +--rw agent-id? yang:uuid | +--rw agent-id? yang:uuid
| +--rw device-id? inet:uri | +--rw device-id? inet:uri
| +--rw group-id? string | +--rw group-id? string
| +--rw measurement-point? string | +--rw measurement-point? string
| +--rw report-agent-id? boolean | +--rw report-agent-id? boolean
| +--rw report-measurement-point? boolean | +--rw report-measurement-point? boolean
| +--rw controller-timeout? uint32 | +--rw controller-timeout? uint32
+--rw schedules +--rw tasks
| +--rw schedule* [name] | +--rw task* [name]
| +--rw name string | +--rw name lmap:identifier
| +--rw event -> /lmap/events/event/name | +--rw metric* [uri]
| +--rw action* [name] | | +--rw uri inet:uri
| | +--rw name string | | +--rw role* string
| | +--rw task -> /lmap/tasks/task/name | +--rw program? string
| | +--rw option* [name] | +--rw option* [id]
| | | +--rw name string | | +--rw id lmap:identifier
| | | +--rw value? string | | +--rw name? string
| | +--rw destination* -> /lmap/schedules/schedule/name | | +--rw value? string
| | +--rw suppression-tag* lmap-common:tag-type | +--rw suppress-by-default? boolean
| +--rw execution-mode? enumeration | +--rw tag* lmap:identifier
| +--rw suppression-tag* lmap-common:tag-type +--rw schedules
+--rw suppressions | +--rw schedule* [name]
| +--rw suppression* [name] | +--rw name lmap:identifier
| +--rw name string | +--rw start event-ref
| +--rw start? -> /lmap/events/event/name | +--rw (stop)?
| +--rw end? -> /lmap/events/event/name | | +--:(end)
| +--rw tag* union | | | +--rw end? event-ref
| +--rw stop-running? boolean | | +--:(duration)
+--rw tasks | | +--rw duration? uint32
| +--rw task* [name] | +--rw execution-mode? enumeration
| +--rw name string | +--rw tag* lmap:tag
| +--rw metric* [uri] | +--rw suppression-tag* lmap:tag
| | +--rw uri inet:uri | +--rw action* [name]
| | +--rw role* string | +--rw name lmap:identifier
| +--rw program? string | +--rw task task-ref
| +--rw option* [name] | +--rw parameters
| | +--rw name string | | +--rw (extension)?
| | +--rw value? string | +--rw option* [id]
| +--rw tag* string | | +--rw id lmap:identifier
| +--rw suppress-by-default? boolean | | +--rw name? string
+--rw events | | +--rw value? string
+--rw event* [name] | +--rw destination* schedule-ref
+--rw name string | +--rw tag* lmap:tag
+--rw (event-type)? | +--rw suppression-tag* lmap:tag
| +--:(periodic) +--rw suppressions
| | +--rw periodic | +--rw suppression* [name]
| | +--rw interval uint32 | +--rw name lmap:identifier
| | +--rw start? yang:date-and-time | +--rw start? event-ref
| | +--rw end? yang:date-and-time | +--rw end? event-ref
| +--:(calendar) | +--rw match* lmap:glob-pattern
| | +--rw calendar | +--rw stop-running? boolean
| | +--rw month* union +--rw events
| | +--rw weekday* union +--rw event* [name]
| | +--rw day-of-month* union +--rw name lmap:identifier
| | +--rw hour* union +--rw (event-type)?
| | +--rw minute* union | +--:(periodic)
| | +--rw second* union | | +--rw periodic
| | +--rw timezone-offset? lmap-common:timezone-offset | | +--rw interval uint32
| | +--rw start? yang:date-and-time | | +--rw start? yang:date-and-time
| | +--rw end? yang:date-and-time | | +--rw end? yang:date-and-time
| +--:(one-off) | +--:(calendar)
| | +--rw one-off-time yang:date-and-time | | +--rw calendar
| +--:(immediate) | | +--rw month* lmap:month-or-all
| | +--rw immediate empty | | +--rw day-of-month* lmap:day-of-months-or-all
| +--:(startup) | | +--rw day-of-week* lmap:weekday-or-all
| | +--rw startup empty | | +--rw hour* lmap:hour-or-all
| +--:(controller-lost) | | +--rw minute* lmap:minute-or-all
| | +--rw controller-lost empty | | +--rw second* lmap:second-or-all
| +--:(controller-ok) | | +--rw timezone-offset? lmap:timezone-offset
| +--rw controller-ok empty | | +--rw start? yang:date-and-time
+--rw random-spread? int32 | | +--rw end? yang:date-and-time
| +--:(one-off)
| | +--rw one-off
| | +--rw time yang:date-and-time
| +--:(immediate)
| | +--rw immediate empty
| +--:(startup)
| | +--rw startup empty
| +--:(controller-lost)
| | +--rw controller-lost empty
| +--:(controller-connected)
| +--rw controller-connected empty
+--rw random-spread? uint32
The tree diagram below shows the structure of the state data model. The tree diagram below shows the structure of the state data model.
module: ietf-lmap-control module: ietf-lmap-control
+--ro lmap-state +--ro lmap-state
+--ro agent +--ro agent
| +--ro agent-id yang:uuid | +--ro agent-id yang:uuid
| +--ro device-id inet:uri | +--ro device-id inet:uri
| +--ro hardware string | +--ro hardware string
| +--ro firmware string | +--ro firmware string
| +--ro version string | +--ro version string
| +--ro last-started yang:date-and-time | +--ro last-started yang:date-and-time
+--ro tasks +--ro tasks
| +--ro task* [name] | +--ro task* [name]
| +--ro name string | +--ro name lmap:identifier
| +--ro metric* [uri] | +--ro metric* [uri]
| | +--ro uri inet:uri | | +--ro uri inet:uri
| | +--ro role* string | | +--ro role* string
| +--ro version? string | +--ro version? string
| +--ro program? string | +--ro program? string
+--ro schedules +--ro schedules
+--ro schedule* [name] | +--ro schedule* [name]
+--ro name string | +--ro name lmap:identifier
+--ro state? enumeration | +--ro state? enumeration
+--ro last-invocation? yang:date-and-time | +--ro invocations? yang:counter32
+--ro action* [name] | +--ro suppressions? yang:counter32
+--ro name string | +--ro overlaps? yang:counter32
+--ro state? enumeration | +--ro failures? yang:counter32
+--ro last-invocation? yang:date-and-time | +--ro last-invocation? yang:date-and-time
+--ro last-completion? yang:date-and-time | +--ro action* [name]
+--ro last-status? lmap-common:status-code | +--ro name lmap:identifier
+--ro last-message? string | +--ro state? enumeration
+--ro last-failed-completion? yang:date-and-time | +--ro invocations? yang:counter32
+--ro last-failed-status? lmap-common:status-code | +--ro suppressions? yang:counter32
+--ro last-failed-message? string | +--ro overlaps? yang:counter32
| +--ro failures? yang:counter32
| +--ro last-invocation? yang:date-and-time
| +--ro last-completion? yang:date-and-time
| +--ro last-status? lmap:status-code
| +--ro last-message? string
| +--ro last-failed-completion? yang:date-and-time
| +--ro last-failed-status? lmap:status-code
| +--ro last-failed-message? string
+--ro suppressions
+--ro suppression* [name]
+--ro name lmap:identifier
+--ro state? enumeration
The tree diagram below shows the structure of the reporting data The tree diagram below shows the structure of the reporting data
model. model.
module: ietf-lmap-report module: ietf-lmap-report
rpcs: rpcs:
+---x report +---x report
+---w input +---w input
+---w date yang:date-and-time +---w date yang:date-and-time
+---w agent-id? yang:uuid +---w agent-id? yang:uuid
+---w group-id? string +---w group-id? string
+---w measurement-point? string +---w measurement-point? string
+---w task* [name] +---w task* [name]
+---w name string +---w name lmap:identifier
+---w metric* [uri] +---w metric* [uri]
| +---w uri inet:uri | +---w uri inet:uri
| +---w role* string | +---w role* string
+---w option* [name] +---w option* [id]
| +---w name string | +---w id lmap:identifier
| +---w name? string
| +---w value? string | +---w value? string
+---w tag* string +---w tag* lmap:tag
+---w header +---w header
| +---w column* string | +---w column* string
+---w row* +---w row*
+---w start yang:date-and-time +---w start yang:date-and-time
+---w end? yang:date-and-time +---w end? yang:date-and-time
+---w conflict* string +---w conflict* string
+---w value* string +---w value* string
3. Relationship to the Information Model 3. Relationship to the Information Model
skipping to change at page 6, line 51 skipping to change at page 8, line 4
described below. Some items have been left out because they are described below. Some items have been left out because they are
expected to be dealt with by the underlying protocol. expected to be dealt with by the underlying protocol.
o Instruction Information: This is modeled in the /lmap/suppressions o Instruction Information: This is modeled in the /lmap/suppressions
subtree, the /lmap/schedules subtree, and the /lmap/tasks subtree subtree, the /lmap/schedules subtree, and the /lmap/tasks subtree
described below. described below.
o Logging Information: Some of the logging information, in o Logging Information: Some of the logging information, in
particular 'success/failure/warning messages in response to particular 'success/failure/warning messages in response to
information updates from the Controller', will be handled by the information updates from the Controller', will be handled by the
protocol used to manipulate the lmap specific configuration. protocol used to manipulate the lmap specific configuration. For
the first version of the LMAP data models, it is assumed that
[[CREF1: It needs to be discussed whether we can rely on informal runtime logging information will be dealt with using protocols
syslog messages that can be accessed via protocols such RFC 5277 that do not require a formal data model, e.g., the Syslog protocol
or whether we want to define specific notifications in the YANG defined in [RFC5424].
data model. --JS]]
o Capability and Status Information: Some of the status information o Capability and Status Information: Some of the status information
is modeled in the /lmap-state/agent subtree and teh /lmap-state/ is modeled in the /lmap-state/agent subtree and teh /lmap-state/
schedules subtree. Information about network interfaces can be schedules subtree. Information about network interfaces can be
obtained from the interfaces YANG data model [RFC7223]. The list obtained from the interfaces YANG data model [RFC7223]. The list
of supported tasks is modeled in the /lmap-state/tasks subtree. of supported tasks is modeled in the /lmap-state/tasks subtree.
o Reporting Information: This is modeled by the report data model to o Reporting Information: This is modeled by the report data model to
be implemented by the Collector. Measurement Agents send results be implemented by the Collector. Measurement Agents send results
to the Collector via an RPC operation. to the Collector via an RPC operation.
skipping to change at page 7, line 39 skipping to change at page 8, line 39
o Task Configurations: This is modeled in the /lmap/tasks subtree. o Task Configurations: This is modeled in the /lmap/tasks subtree.
o Event Information: This is modeled in the /lmap/events subtree. o Event Information: This is modeled in the /lmap/events subtree.
4. YANG Modules 4. YANG Modules
The modules import definitions from [RFC6991] and [RFC7223] and they The modules import definitions from [RFC6991] and [RFC7223] and they
reference [RFC7398]. reference [RFC7398].
<CODE BEGINS> file "ietf-lmap-common@2015-10-28.yang" <CODE BEGINS> file "ietf-lmap-common@2016-03-15.yang"
module ietf-lmap-common { module ietf-lmap-common {
namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-common"; namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-common";
prefix "lmap-common"; prefix "lmap";
import ietf-yang-types {
prefix yang;
}
import ietf-inet-types { import ietf-inet-types {
prefix inet; prefix inet;
} }
organization organization
"IETF Large-Scale Measurement Platforms Working Group"; "IETF Large-Scale Measurement Platforms Working Group";
contact contact
"WG Web: <http://tools.ietf.org/wg/lmap/> "WG Web: <http://tools.ietf.org/wg/lmap/>
WG List: <mailto:lmap@ietf.org> WG List: <mailto:lmap@ietf.org>
Editor: Juergen Schoenwaelder Editor: Juergen Schoenwaelder
<j.schoenwaelder@jacobs-university.de> <j.schoenwaelder@jacobs-university.de>
skipping to change at page 8, line 23 skipping to change at page 9, line 21
Editor: Vaibhav Bajpai Editor: Vaibhav Bajpai
<v.bajpai@jacobs-university.de>"; <v.bajpai@jacobs-university.de>";
description description
"This module provides common definitions used by the data "This module provides common definitions used by the data
models written for Large-Scale Measurement Platforms (LMAP). models written for Large-Scale Measurement Platforms (LMAP).
This module defines typedefs and groupings but no schema This module defines typedefs and groupings but no schema
tree elements."; tree elements.";
revision "2015-10-28" { revision "2016-03-15" {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXX: A YANG Data Model for LMAP Measurement Agents"; "RFC XXX: A YANG Data Model for LMAP Measurement Agents";
} }
/* /*
* Typedefs * Typedefs
*/ */
typedef tag-type { typedef identifier {
type string { type string {
length "1..max"; length "1..max";
pattern '[^\*].*';
} }
description description
"A tag consists of at least one character and a tag is "An string value used to name something.";
not allowed to start with an asterisk '*'.";
// XXX: Does it make sense to have stricter rules,
// XXX: e.g., disallow white space?
} }
typedef tag-matchall-type { typedef tag {
type string { type string {
pattern '\*'; length "1..max";
} }
description description
"The string containing a single asterisk '*' is used "A tag consists of at least one character.";
to match all tags.";
// XXX: Allow glob-style matching, turning this into a
// XXX: tag-match-type?
} }
typedef wildcard { typedef glob-pattern {
type string { type string {
pattern '\*'; length "1..max";
} }
description description
"A wildcard for calendar scheduling entries."; "A glob style pattern (following POSIX.2 fnmatch() without
special treatment of file paths):
* matches a sequence of characters
? matches a single character
[seq] matches any character in seq
[!seq] matches any character not in seq
A backslash followed by a character matches the following
character. In particular:
\* matches *
\? matches ?
\\ matches \
A sequence seq may be a sequence of characters (e.g., [abc]
or a range of characters (e.g., [a-c]).";
} }
typedef weekday { typedef wildcard {
type enumeration { type string {
enum sunday { pattern '\*';
value 0;
description "Sunday of the week";
}
enum monday {
value 1;
description "Monday of the week";
}
enum tuesday {
value 2;
description "Tuesday of the week";
}
enum wednesday {
value 3;
description "Wednesday of the week";
}
enum thursday {
value 4;
description "Thursday of the week";
}
enum friday {
value 5;
description "Friday of the week";
}
enum saturday {
value 6;
description "Saturday of the week";
}
} }
description description
"A type modeling the weekdays in the Greco-Roman "A wildcard for calendar scheduling entries.";
tradition.";
} }
typedef month { typedef month {
type enumeration { type enumeration {
enum january { enum january {
value 1; value 1;
description "January of the Julian and Gregorian calendar"; description
"January of the Gregorian calendar.";
} }
enum february { enum february {
value 2; value 2;
description "February of the Julian and Gregorian calendar"; description
"February of the Gregorian calendar.";
} }
enum march { enum march {
value 3; value 3;
description "March of the Julian and Gregorian calendar"; description
"March of the Gregorian calendar.";
} }
enum april { enum april {
value 4; value 4;
description "April of the Julian and Gregorian calendar"; description
"April of the Gregorian calendar.";
} }
enum may { enum may {
value 5; value 5;
description "May of the Julian and Gregorian calendar"; description
"May of the Gregorian calendar.";
} }
enum june { enum june {
value 6; value 6;
description "June of the Julian and Gregorian calendar"; description
"June of the Gregorian calendar.";
} }
enum july { enum july {
value 7; value 7;
description "July of the Julian and Gregorian calendar"; description
"July of the Gregorian calendar.";
} }
enum august { enum august {
value 8; value 8;
description "August of the Julian and Gregorian calendar"; description
"August of the Gregorian calendar.";
} }
enum september { enum september {
value 9; value 9;
description "September of the Julian and Gregorian calendar"; description
"September of the Gregorian calendar.";
} }
enum october { enum october {
value 10; value 10;
description "October of the Julian and Gregorian calendar"; description
"October of the Gregorian calendar.";
} }
enum november { enum november {
value 11; value 11;
description "November of the Julian and Gregorian calendar"; description
"November of the Gregorian calendar.";
} }
enum december { enum december {
value 12; value 12;
description "December of the Julian and Gregorian calendar"; description
"December of the Gregorian calendar.";
} }
} }
description description
"A type modeling the month in the Julian and Gregorian "A type modeling the month in the Gregorian calendar.";
tradition."; }
typedef month-or-all {
type union {
type month;
type wildcard;
}
description
"A month or a wildcard indicating all twelve months.";
}
typedef day-of-month {
type uint8 { range "1..31"; }
description
"A day of a month of the Gregorian calendar.";
}
typedef day-of-months-or-all {
type union {
type day-of-month;
type wildcard;
}
description
"A day of a months or a wildcard indicating all days
of a month.";
}
typedef weekday {
type enumeration {
enum monday {
value 1;
description
"Monday of the Gregorian calendar.";
}
enum tuesday {
value 2;
description
"Tuesday of the Gregorian calendar.";
}
enum wednesday {
value 3;
description
"Wednesday of the Gregorian calendar.";
}
enum thursday {
value 4;
description
"Thursday of the Gregorian calendar.";
}
enum friday {
value 5;
description
"Friday of the Gregorian calendar.";
}
enum saturday {
value 6;
description
"Saturday of the Gregorian calendar.";
}
enum sunday {
value 7;
description
"Sunday of the Gregorian calendar.";
}
}
description
"A type modeling the weekdays in the Gregorian calendar.
The numbering follows the ISO 8601 scheme.";
}
typedef weekday-or-all {
type union {
type weekday;
type wildcard;
}
description
"A weekday or a wildcard indicating all seven weekdays.";
}
typedef hour {
type uint8 { range "0..23"; }
description
"An hour of a day.";
}
typedef hour-or-all {
type union {
type hour;
type wildcard;
}
description
"An hour of a day or a wildcard indicating all hours
of a day.";
}
typedef minute {
type uint8 { range "0..59"; }
description
"A minute of an hour.";
}
typedef minute-or-all {
type union {
type minute;
type wildcard;
}
description
"A minute of an hour or a wildcard indicating all
minutes of an hour.";
}
typedef second {
type uint8 { range "0..59"; }
description
"A second of a minute.";
}
typedef second-or-all {
type union {
type second;
type wildcard;
}
description
"A second of a minute or a wildcard indicating all
seconds of a minute.";
} }
typedef status-code { typedef status-code {
type int32; type int32;
description description
"A status code returned by the execution of a task. Note that "A status code returned by the execution of a task. Note
the actual range is implementation dependent but it should that the actual range is implementation dependent but it
be portable to use values in the range 0..127 for regular should be portable to use values in the range 0..127 for
exit codes. By convention, 0 indicates successful termination. regular exit codes. By convention, 0 indicates successful
Negative values may be used to indicate abnormal termination termination. Negative values may be used to indicate
due to a signal; the absolute value may identify the signal abnormal termination due to a signal; the absolute value
number in this case."; may identify the signal number in this case.";
} }
typedef timezone-offset { typedef timezone-offset {
type string { type string {
pattern 'Z|[\+\-]\d{2}:\d{2}'; pattern 'Z|[\+\-]\d{2}:\d{2}';
} }
description description
"A timezone-offset as it is use in the yang:date-and-time "A timezone-offset as it is used by the date-and-time type
type. The value Z is equivalent to +00:00. The value -00:00 defined in the ietf-yang-types module. The value Z is
indicates and unknown time-offset."; equivalent to +00:00. The value -00:00 indicates and
unknown time-offset.";
reference
"RFC 6991: Common YANG Data Types";
} }
/* /*
* Groupings * Groupings
*/ */
grouping metrics-grouping { grouping metrics-grouping {
description description
"This grouping models a list of entry in a metrics registry."; "This grouping models a list of entries in a metrics
registry.";
list metric { list metric {
key uri; key uri;
description description
"A list of entries in a metrics registry."; "A list of entries in a metrics registry.";
leaf uri { leaf uri {
type inet:uri; type inet:uri;
description description
"A URI identifying an entry in a metrics registry."; "A URI identifying an entry in a metrics registry.";
skipping to change at page 12, line 18 skipping to change at page 15, line 41
} }
} }
} }
grouping task-options-grouping { grouping task-options-grouping {
description description
"A list of options of a task. Each option is a name/value "A list of options of a task. Each option is a name/value
pair (where the value may be absent)."; pair (where the value may be absent).";
list option { list option {
key "name"; key "id";
ordered-by user; ordered-by user;
description description
"A list of options passed to the task. It is a list of "A list of options passed to the task. It is a list of
key / value pairs and may be used to model options. key / value pairs and may be used to model options.
Options may be used to identify the role of a task Options may be used to identify the role of a task
or to pass a channel name to a task."; or to pass a channel name to a task.";
// XXX This is kind of broken since making the option name leaf id {
// XXX a key means that a certain option may only appear once. type lmap:identifier;
// XXX This is not workable since some tests require a list of description
// XXX targets. Turning this into a leaf-list of args also "An identifier uniquely identifying an option. This
// XXX does not work since YANG requires leaf-list values to identifier is required by YANG to uniquely identify
// XXX be unique. Oops. a name value pair but it otherwise has no semantic
value";
}
leaf name { leaf name {
type string; type string;
description description
"The name of the option."; "The name of the option.";
} }
leaf value { leaf value {
type string; type string;
description description
"The value of the option."; "The value of the option.";
} }
} }
} }
} }
<CODE ENDS> <CODE ENDS>
<CODE BEGINS> file "ietf-lmap-control@2015-10-28.yang"
<CODE BEGINS> file "ietf-lmap-control@2016-03-15.yang"
module ietf-lmap-control { module ietf-lmap-control {
namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-control"; namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-control";
prefix "lmap-control"; prefix "lmapc";
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
} }
import ietf-inet-types { import ietf-inet-types {
prefix inet; prefix inet;
} }
import ietf-lmap-common { import ietf-lmap-common {
prefix lmap-common; prefix lmap;
} }
organization organization
"IETF Large-Scale Measurement Platforms Working Group"; "IETF Large-Scale Measurement Platforms Working Group";
contact contact
"WG Web: <http://tools.ietf.org/wg/lmap/> "WG Web: <http://tools.ietf.org/wg/lmap/>
WG List: <mailto:lmap@ietf.org> WG List: <mailto:lmap@ietf.org>
Editor: Juergen Schoenwaelder Editor: Juergen Schoenwaelder
skipping to change at page 13, line 39 skipping to change at page 17, line 15
Editor: Vaibhav Bajpai Editor: Vaibhav Bajpai
<v.bajpai@jacobs-university.de>"; <v.bajpai@jacobs-university.de>";
description description
"This module defines a data model for controlling measurement "This module defines a data model for controlling measurement
agents that are part of a Large-Scale Measurement Platform agents that are part of a Large-Scale Measurement Platform
(LMAP). This data model is expected to be implemented by a (LMAP). This data model is expected to be implemented by a
measurement agent."; measurement agent.";
revision "2015-10-28" { revision "2016-03-15" {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXX: A YANG Data Model for LMAP Measurement Agents"; "RFC XXX: A YANG Data Model for LMAP Measurement Agents";
} }
/* /*
* Typedefs
*/
typedef event-ref {
type leafref {
path "/lmap/events/event/name";
}
description
"This type is used by data models that need to reference
a configured event source.";
}
typedef task-ref {
type leafref {
path "/lmap/tasks/task/name";
}
description
"This type is used by data models that need to reference
a configured task.";
}
typedef schedule-ref {
type leafref {
path "/lmap/schedules/schedule/name";
}
description
"This type is used by data models that need to reference
a configured schedule.";
}
/*
* Groupings * Groupings
*/ */
grouping timing-start-end-grouping { grouping timing-start-end-grouping {
description description
"A grouping that provides start and end times for "A grouping that provides start and end times for
timing objects."; timing objects.";
leaf start { leaf start {
type yang:date-and-time; type yang:date-and-time;
description description
skipping to change at page 14, line 35 skipping to change at page 18, line 41
/* /*
* Configuration data nodes * Configuration data nodes
*/ */
container lmap { container lmap {
description description
"Configuration of the LMAP agent."; "Configuration of the LMAP agent.";
/* /*
* Common Information Objects: Configuration * Agent Configuration
*/ */
container agent { container agent {
description description
"Configuration of parameters affecting the whole "Configuration of parameters affecting the whole
measurement agent."; measurement agent.";
leaf agent-id { leaf agent-id {
type yang:uuid; type yang:uuid;
description description
skipping to change at page 15, line 35 skipping to change at page 19, line 41
"The measurement point indicating where the "The measurement point indicating where the
measurement agent is located on a path."; measurement agent is located on a path.";
reference reference
"RFC 7398: A Reference Path and Measurement Points "RFC 7398: A Reference Path and Measurement Points
for Large-Scale Measurement of Broadband for Large-Scale Measurement of Broadband
Performance"; Performance";
} }
leaf report-agent-id { leaf report-agent-id {
type boolean; type boolean;
must "../agent-id" { must '. != "true" or ../agent-id' {
description description
"An agent-id must exist for this to be set."; "An agent-id must exist for this to be set
to true.";
} }
default false;
description description
"The 'report-agent-id' controls whether the "The 'report-agent-id' controls whether the
'agent-id' is reported to collectors if the 'agent-id' is reported to collectors if the
'group-id' is configured. If the 'group-id' 'group-id' is configured. If the 'group-id'
is not configured, the agent-id is always is not configured, the agent-id is always
reported."; reported.";
} }
leaf report-measurement-point { leaf report-measurement-point {
type boolean; type boolean;
must "../measurement-point" { must '. != "true" or ../measurement-point' {
description description
"A measurement-point must exist for this to be set."; "A measurement-point must exist for this to be
set to true.";
} }
default false;
description description
"The 'report-measurement-point' controls whether "The 'report-measurement-point' controls whether
the 'measurement-point' is reported to collectors the 'measurement-point' is reported to collectors
if the 'measurement-point' is configured."; if the 'measurement-point' is configured.";
} }
leaf controller-timeout { leaf controller-timeout {
type uint32; type uint32;
units "seconds"; units "seconds";
description description
"A timer is started after each successful contact "A timer is started after each successful contact
with a controller. When the timer reaches the with a controller. When the timer reaches the
controller-timeout, an event is raised indicating controller-timeout, an event is raised indicating
that connectivity to the controller has been lost."; that connectivity to the controller has been lost.";
}
}
/*
* Task Configuration
*/
container tasks {
description
"Configuration of LMAP tasks.";
list task {
key name;
description
"The list of tasks configured on the LMAP agent.";
leaf name {
type lmap:identifier;
description
"The unique name of a task.";
}
uses lmap:metrics-grouping;
leaf program {
type string;
description
"The (local) program to invoke in order to execute
the task.";
}
uses lmap:task-options-grouping {
description
"The list of task specific options.";
}
leaf suppress-by-default {
type boolean;
default true;
description
"Indicates whether the task will be suppressed by
a default supression.";
}
leaf-list tag {
type lmap:identifier;
description
"A tag contains additional information that is
passed with the result record to the collector.
A tag can be used, for example, to carry the
Measurement Cycle ID.";
} }
} }
}
/* /*
* Common Information Objects: Schedules * Schedule Instructions
*/ */
container schedules { container schedules {
description description
"Configuration of LMAP schedules. Schedules control which "Configuration of LMAP schedules. Schedules control
tasks are executed by the LMAP implementation."; which tasks are executed by the LMAP implementation.";
list schedule { list schedule {
key name; key name;
description description
"Configuration of a particular schedule."; "Configuration of a particular schedule.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The locally-unique, administratively assigned name for "The locally-unique, administratively assigned name
this schedule."; for this schedule.";
} }
leaf event { leaf start {
type leafref { type event-ref;
path "/lmap/events/event/name";
}
mandatory true; mandatory true;
description description
"The event source controlling the start of the scheduled "The event source controlling the start of the
tasks."; scheduled actions.";
} }
list action {
key name;
description
"An action describes a task that is invoked by the
schedule. Multiple actions are invoked sequentially.";
leaf name {
type string;
description
"The unique identifier for this action.";
}
leaf task { choice stop {
type leafref { description
path "/lmap/tasks/task/name"; "This choice contains optional leafs that control the
} graceful forced termination of scheduled actions.
mandatory true; When the end has been reached, the scheduled actions
description should be forced to terminate the measurements.
"The tasks invoked by this action."; This may involve being active some additional time in
} order to properly finish the action's activity (e.g.,
waiting for any still outstanding messages).";
uses lmap-common:task-options-grouping {
description
"The list of action specific options that are
appended to the list of task specific options.";
}
leaf-list destination { leaf end {
type leafref { type event-ref;
path "/lmap/schedules/schedule/name";
}
description description
"A schedule of receiving the output produced by "The event source controlling the graceful
this action. A queue is internally used to pass forced termination of the scheduled actions.";
results to another schedule. The behaviour of
an action passing data to its own schedule is
implementation specific.
Data passed to a sequential or pipelined schedule
is consumed by the schedule's first action. Data
passed to a parallel schedule is consumed by all
actions of the schedule.";
} }
leaf-list suppression-tag { leaf duration {
type lmap-common:tag-type; type uint32;
units "seconds";
description description
"A list of suppression tags."; "The duration controlling the graceful forced
termination of the scheduled actions.";
} }
} }
leaf execution-mode { leaf execution-mode {
type enumeration { type enumeration {
enum sequential { enum sequential {
value 1; value 1;
description description
"The actions of the schedule are executed "The actions of the schedule are executed
sequentially."; sequentially.";
skipping to change at page 18, line 36 skipping to change at page 23, line 22
pipelined mode. Output created by an action is pipelined mode. Output created by an action is
passed as input to the subsequent action."; passed as input to the subsequent action.";
} }
} }
default pipelined; default pipelined;
description description
"The execution mode of this schedule determins in "The execution mode of this schedule determins in
which order the actions of the schedule are executed."; which order the actions of the schedule are executed.";
} }
leaf-list tag {
type lmap:tag;
description
"A list of schedule specific tags that are
reported together with the measurement results
to a collector.";
}
leaf-list suppression-tag { leaf-list suppression-tag {
type lmap-common:tag-type; type lmap:tag;
description description
"A list of suppression tags."; "A list of suppression tags that are used to select
schedules to be suppressed.";
}
list action {
key name;
description
"An action describes a task that is invoked by the
schedule. Multiple actions are invoked sequentially.";
leaf name {
type lmap:identifier;
description
"The unique identifier for this action.";
}
leaf task {
type task-ref;
mandatory true;
description
"The task invoked by this action.";
}
container parameters {
description
"This container is a place-holder for run-time
parameters defined in task-specific or
metric-specific data models augmenting the
base lmap control data model.";
choice extension {
description
"This choice is provided to augment in different
sets of parameters.";
}
}
uses lmap:task-options-grouping {
description
"The list of action specific options that are
appended to the list of task specific options.";
}
leaf-list destination {
type schedule-ref;
description
"A schedule of receiving the output produced by
this action. A queue is internally used to pass
results to another schedule. The behaviour of
an action passing data to its own schedule is
implementation specific.
Data passed to a sequential or pipelined schedule
is consumed by the schedule's first action. Data
passed to a parallel schedule is consumed by all
actions of the schedule.";
}
leaf-list tag {
type lmap:tag;
description
"A list of action specific tags that are
reported together with the measurement results
to a collector.";
}
leaf-list suppression-tag {
type lmap:tag;
description
"A list of suppression tags that are used to select
actions to be suppressed.";
}
} }
} }
} }
/* /*
* Suppression * Suppression Instructions
*/ */
container suppressions { container suppressions {
description description
"Suppression information to prevent schedules or "Suppression information to prevent schedules or
certain actions from starting."; certain actions from starting.";
list suppression { list suppression {
key name; key name;
description description
"Configuration of a particular suppression."; "Configuration of a particular suppression.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The locally-unique, administratively assigned name for "The locally-unique, administratively assigned name
this suppression."; for this suppression.";
} }
leaf start { leaf start {
type leafref { type event-ref;
path "/lmap/events/event/name";
}
description description
"The event source controlling the start of the "The event source controlling the start of the
suppression period."; suppression period.";
} }
leaf end { leaf end {
type leafref { type event-ref;
path "/lmap/events/event/name";
}
description description
"The event source controlling the end of the "The event source controlling the end of the
suppression period. If not present, supression suppression period. If not present, supression
continues indefinitely."; continues indefinitely.";
} }
leaf-list tag { leaf-list match {
type union { type lmap:glob-pattern;
type lmap-common:tag-type;
type lmap-common:tag-matchall-type;
}
description description
"A list of suppression tags. The suppression will "A list of suppression tags. The suppression will
apply to all schedules (and their actions) that have apply to all schedules (and their actions) that
a matching value in their suppression-tags and to have a matching value in their suppression-tags
all actions that have a matching value in their and to all actions that have a matching value in
suppression-tags."; their suppression-tags.";
} }
leaf stop-running { leaf stop-running {
type boolean; type boolean;
default false; default false;
description description
"Setting 'stop-running' to true will cause running "Setting 'stop-running' to true will cause running
tasks to be terminated if suppression is activated. tasks to be terminated if suppression is activated.
Otherwise, running tasks will not be affected if Otherwise, running tasks will not be affected if
suppression is activated."; suppression is activated.";
} }
} }
} }
/* /*
* Common Information Objects: Task Configurations * Event Instructions
*/
container tasks {
description
"Configuration of LMAP tasks.";
list task {
key name;
description
"The list of tasks configured on the LMAP agent.";
leaf name {
type string;
description
"The unique name of a task.";
}
uses lmap-common:metrics-grouping;
leaf program {
type string;
description
"The (local) program to invoke in order to execute
the task.";
}
uses lmap-common:task-options-grouping {
description
"The list of task specific options.";
}
leaf-list tag {
type string;
description
"A tag contains additional information that is passed
with the result record to the collector. A tag can be
used to carry the Measurement Cycle ID.";
}
leaf suppress-by-default {
type boolean;
default true;
description
"Indicates whether the task will be suppressed by
a default supression.";
}
}
}
/*
* Common Information Objects: Event Information
*/ */
container events { container events {
description description
"Configuration of LMAP events. "Configuration of LMAP events.
Implementations may be forced to delay acting Implementations may be forced to delay acting
upon the occurance of events in the face of local upon the occurance of events in the face of local
constraints. An action triggered by an event constraints. An action triggered by an event
therefore should not rely on the accuracy therefore should not rely on the accuracy
provided by the scheduler implementation."; provided by the scheduler implementation.";
list event { list event {
key name; key name;
description description
"The list of event sources configured on the "The list of event sources configured on the
LMAP agent."; LMAP agent.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The unique name of an event source."; "The unique name of an event source.";
} }
choice event-type { choice event-type {
description description
"Different types of events are handled by "Different types of events are handled by
different branches of this choice. Note that different branches of this choice. Note that
this choice can be extended via augmentations."; this choice can be extended via augmentations.";
case periodic { case periodic {
container periodic { container periodic {
description description
"A periodic timing object triggers periodically "A periodic timing object triggers periodically
according to a regular interval."; according to a regular interval.";
leaf interval { leaf interval {
type uint32; type uint32 {
units "milliseconds"; range "1..max";
}
units "seconds";
mandatory true; mandatory true;
description description
"The number of milliseconds between two triggers "The number of seconds between two triggers
generated by this periodic timing object. generated by this periodic timing object.";
The execution system must not generate triggers
for periodic timing objects that have a interval
value of 0. A periodic timing object with an
interval of 0 milliseconds will therefore never
trigger.";
} }
uses timing-start-end-grouping; uses timing-start-end-grouping;
} }
} }
case calendar { case calendar {
container calendar { container calendar {
description description
"A calendar timing object triggers based on the "A calendar timing object triggers based on the
current calendar date and time."; current calendar date and time.";
leaf-list month { leaf-list month {
type union { type lmap:month-or-all;
type lmap-common:month; min-elements 1;
type lmap-common:wildcard;
}
description description
"A month at which this calendar timing will "A month at which this calendar timing will
trigger. The wildcard means all months."; trigger. The wildcard means all months.";
} }
leaf-list weekday { leaf-list day-of-month {
type union { type lmap:day-of-months-or-all;
type lmap-common:weekday; min-elements 1;
type lmap-common:wildcard;
}
description description
"A weekday at which this calendar timing will "A day of the month at which this calendar
trigger. The wildcard means all weekdays."; timing will trigger. The wildcard means all
days of a month.";
} }
leaf-list day-of-month { leaf-list day-of-week {
type union { type lmap:weekday-or-all;
type int8 { range "-31..-1 | 1..31"; } min-elements 1;
type lmap-common:wildcard;
}
description description
"A day in the month at which this calendar "A weekday at which this calendar timing will
timing will trigger. Negative numbers indicate trigger. The wildcard means all weekdays.";
days counted backwards from the end of the
months. The wildcard means all days of a month.";
} }
leaf-list hour { leaf-list hour {
type union { type lmap:hour-or-all;
type int8 { range "0..23"; } min-elements 1;
type lmap-common:wildcard;
}
description description
"An hour at which this calendar timing will "An hour at which this calendar timing will
trigger. The wildcard means all hours of a day."; trigger. The wildcard means all hours of a
day.";
} }
leaf-list minute { leaf-list minute {
type union { type lmap:minute-or-all;
type int8 { range "0..59"; } min-elements 1;
type lmap-common:wildcard;
}
description description
"A minute at which this calendar timing will "A minute at which this calendar timing will
trigger. The wildcard means all minutes of trigger. The wildcard means all minutes of
an hour."; an hour.";
} }
leaf-list second { leaf-list second {
type union { type lmap:second-or-all;
type int8 { range "0..59"; } min-elements 1;
type lmap-common:wildcard;
}
description description
"A second at which this calendar timing will "A second at which this calendar timing will
trigger. The wildcard means all seconds of trigger. The wildcard means all seconds of
a minute."; a minute.";
} }
leaf timezone-offset { leaf timezone-offset {
type lmap-common:timezone-offset; type lmap:timezone-offset;
description description
"The timezone in which this calendar timing "The timezone in which this calendar timing
object will be evaluated."; object will be evaluated. If not present,
the systems' local timezone will be used.";
} }
uses timing-start-end-grouping; uses timing-start-end-grouping;
} }
} }
case one-off { case one-off {
leaf one-off-time { container one-off {
type yang:date-and-time;
mandatory true;
description description
"This one-off timing object triggers once at the "A one-off timing object triggers exactly once.";
configured one-off-time.";
leaf time {
type yang:date-and-time;
mandatory true;
description
"This one-off timing object triggers once at
the configured date and time.";
}
} }
} }
case immediate { case immediate {
leaf immediate { leaf immediate {
type empty; type empty;
mandatory true; mandatory true;
description description
"This immediate event object triggers immediately "This immediate event object triggers immediately
when it is configured."; when it is configured.";
skipping to change at page 24, line 48 skipping to change at page 29, line 46
leaf controller-lost { leaf controller-lost {
type empty; type empty;
mandatory true; mandatory true;
description description
"The controller-lost event object triggers when "The controller-lost event object triggers when
the connectivity to the controller has been lost the connectivity to the controller has been lost
for at least 'controller-timeout' seconds."; for at least 'controller-timeout' seconds.";
} }
} }
case controller-ok { case controller-connected {
leaf controller-ok { leaf controller-connected {
type empty; type empty;
mandatory true; mandatory true;
description description
"The controller-ok event object triggers when "The controller-connected event object triggers
the connectivity to the controller has been when the connectivity to the controller has been
restored after it was lost for at least restored after it was lost for at least
'controller-timeout' seconds."; 'controller-timeout' seconds.";
} }
} }
} }
leaf random-spread { leaf random-spread {
type int32; type uint32;
units milliseconds; units seconds;
description description
"This optional leaf adds a random spread to the "This optional leaf adds a random spread to the
computation of the trigger."; computation of the event's trigger time. The
random spread is a uniformly distributed random
number taken from the interval [0:random-spread].";
} }
} }
} }
} }
/* /*
* The state subtree provides information about the capabilities * The state subtree provides information about the capabilities
* and the current status of the MA. * and the current status of the MA.
*/ */
skipping to change at page 26, line 51 skipping to change at page 31, line 51
description description
"Available LMAP tasks, including information about their "Available LMAP tasks, including information about their
last execution and their last failed execution."; last execution and their last failed execution.";
list task { list task {
key name; key name;
description description
"The list of tasks available on the LMAP agent."; "The list of tasks available on the LMAP agent.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The unique name of a task."; "The unique name of a task.";
} }
uses lmap-common:metrics-grouping; uses lmap:metrics-grouping;
leaf version { leaf version {
type string; type string;
description description
"A short description of the software implementing "A short description of the software implementing
the task. This should include the version the task. This should include the version
number of the measurement task software."; number of the measurement task software.";
} }
leaf program { leaf program {
skipping to change at page 27, line 37 skipping to change at page 32, line 37
container schedules { container schedules {
description description
"State of LMAP schedules."; "State of LMAP schedules.";
list schedule { list schedule {
key name; key name;
description description
"State of a particular schedule."; "State of a particular schedule.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The locally-unique, administratively assigned name for "The locally-unique, administratively assigned name
this schedule."; for this schedule.";
} }
leaf state { leaf state {
type enumeration { type enumeration {
enum enabled { enum enabled {
value 1; value 1;
description description
"The value 'enabled' indicates that the "The value 'enabled' indicates that the
schedule is currently enabled."; schedule is currently enabled.";
} }
enum disabled { enum disabled {
value 2; value 2;
description description
"The value 'disabled' indicates that the "The value 'disabled' indicates that the
schedule is currently disabled."; schedule is currently disabled.";
} }
enum suppressed { enum running {
value 3; value 3;
description description
"The value 'running' indicates that the
schedule is currently running.";
}
enum suppressed {
value 4;
description
"The value 'suppressed' indicates that the "The value 'suppressed' indicates that the
schedule is currently suppressed."; schedule is currently suppressed.";
} }
} }
description description
"The current state of the schedule."; "The current state of the schedule.";
} }
leaf invocations {
type yang:counter32;
description
"Number of invocations of this schedule. This counter
does not include suppressed invocations or invocations
that were prevented due to an overlap with a previous
invocation of this schedule.";
}
leaf suppressions {
type yang:counter32;
description
"Number of suppressed executions of this schedule.";
}
leaf overlaps {
type yang:counter32;
description
"Number of executions prevented due to overlaps with
a previous invocation of this schedule.";
}
leaf failures {
type yang:counter32;
description
"Number of failed executions of this schedule. A
failed execution is an execution where at least
one action failed.";
}
leaf last-invocation { leaf last-invocation {
type yang:date-and-time; type yang:date-and-time;
description description
"The date and time of the last invocation of "The date and time of the last invocation of
this schedule."; this schedule.";
} }
list action { list action {
key name; key name;
description description
"The state of the actions associated with this "The state of the actions associated with this
schedule entry."; schedule entry.";
leaf name { leaf name {
type string; type lmap:identifier;
description description
"The unique identifier for this action."; "The unique identifier for this action.";
} }
leaf state { leaf state {
type enumeration { type enumeration {
enum enabled { enum enabled {
value 1; value 1;
description description
"The value 'enabled' indicates that the "The value 'enabled' indicates that the
skipping to change at page 29, line 4 skipping to change at page 34, line 40
value 1; value 1;
description description
"The value 'enabled' indicates that the "The value 'enabled' indicates that the
action is currently enabled."; action is currently enabled.";
} }
enum disabled { enum disabled {
value 2; value 2;
description description
"The value 'disabled' indicates that the "The value 'disabled' indicates that the
action is currently disabled."; action is currently disabled.";
} }
enum suppressed { enum running {
value 3; value 3;
description description
"The value 'running' indicates that the
action is currently runnning.";
}
enum suppressed {
value 4;
description
"The value 'suppressed' indicates that the "The value 'suppressed' indicates that the
action is currently suppressed."; action is currently suppressed.";
} }
} }
description description
"The current state of the action."; "The current state of the action.";
} }
leaf invocations {
type yang:counter32;
description
"Number of invocations of this action. This counter
does not include suppressed invocations or invocations
that were prevented due to an overlap with a previous
invocation of this action.";
}
leaf suppressions {
type yang:counter32;
description
"Number of suppressed executions of this action.";
}
leaf overlaps {
type yang:counter32;
description
"Number of executions prevented due to overlaps with
a previous invocation of this action.";
}
leaf failures {
type yang:counter32;
description
"Number of failed executions of this action.";
}
leaf last-invocation { leaf last-invocation {
type yang:date-and-time; type yang:date-and-time;
description description
"The date and time of the last invocation of "The date and time of the last invocation of
this action."; this action.";
} }
leaf last-completion { leaf last-completion {
type yang:date-and-time; type yang:date-and-time;
description description
skipping to change at page 29, line 30 skipping to change at page 36, line 4
"The date and time of the last invocation of "The date and time of the last invocation of
this action."; this action.";
} }
leaf last-completion { leaf last-completion {
type yang:date-and-time; type yang:date-and-time;
description description
"The date and time of the last completion of "The date and time of the last completion of
this action."; this action.";
} }
leaf last-status { leaf last-status {
type lmap-common:status-code; type lmap:status-code;
description description
"The status code returned by the last execution of "The status code returned by the last execution of
this action."; this action.";
} }
leaf last-message { leaf last-message {
type string; type string;
description description
"The status message produced by the last execution "The status message produced by the last execution
of this action."; of this action.";
} }
leaf last-failed-completion { leaf last-failed-completion {
type yang:date-and-time; type yang:date-and-time;
description description
"The date and time of the last failed completion "The date and time of the last failed completion
of this action."; of this action.";
} }
leaf last-failed-status { leaf last-failed-status {
type lmap-common:status-code; type lmap:status-code;
description description
"The status code returned by the last failed execution "The status code returned by the last failed
of this action."; execution of this action.";
} }
leaf last-failed-message { leaf last-failed-message {
type string; type string;
description description
"The status message produced by the last failed "The status message produced by the last failed
execution of this action."; execution of this action.";
} }
} }
} }
} }
container suppressions {
description
"State of LMAP suppressions.";
list suppression {
key name;
description
"State of a particular suppression.";
leaf name {
type lmap:identifier;
description
"The locally-unique, administratively assigned name
for this suppression.";
}
leaf state {
type enumeration {
enum enabled {
value 1;
description
"The value 'enabled' indicates that the
suppression is currently enabled.";
}
enum disabled {
value 2;
description
"The value 'disabled' indicates that the
suppression is currently disabled.";
}
enum active {
value 3;
description
"The value 'active' indicates that the
suppression is currently active.";
}
}
description
"The current state of the suppression.";
}
}
}
} }
} }
<CODE ENDS> <CODE ENDS>
<CODE BEGINS> file "ietf-lmap-report@2015-10-28.yang" <CODE BEGINS> file "ietf-lmap-report@2016-03-15.yang"
module ietf-lmap-report { module ietf-lmap-report {
namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-report"; namespace "urn:ietf:params:xml:ns:yang:ietf-lmap-report";
prefix "lmap-report"; prefix "lmapr";
import ietf-yang-types { import ietf-yang-types {
prefix yang; prefix yang;
} }
import ietf-lmap-common { import ietf-lmap-common {
prefix lmap-common; prefix lmap;
} }
organization organization
"IETF Large-Scale Measurement Platforms Working Group"; "IETF Large-Scale Measurement Platforms Working Group";
contact contact
"WG Web: <http://tools.ietf.org/wg/lmap/> "WG Web: <http://tools.ietf.org/wg/lmap/>
WG List: <mailto:lmap@ietf.org> WG List: <mailto:lmap@ietf.org>
Editor: Juergen Schoenwaelder Editor: Juergen Schoenwaelder
<j.schoenwaelder@jacobs-university.de> <j.schoenwaelder@jacobs-university.de>
Editor: Vaibhav Bajpai Editor: Vaibhav Bajpai
<v.bajpai@jacobs-university.de>"; <v.bajpai@jacobs-university.de>";
description description
"This module defines a data model for reporting results from "This module defines a data model for reporting results from
measurement agents, which are part of a Large-Scale Measurement measurement agents, which are part of a Large-Scale Measurement
Platform (LMAP), to result data collectors. This data model is Platform (LMAP), to result data collectors. This data model is
expected to be implemented by a collector."; expected to be implemented by a collector.";
revision "2015-10-28" { revision "2016-03-15" {
description description
"Initial version"; "Initial version";
reference reference
"RFC XXX: A YANG Data Model for LMAP Measurement Agents"; "RFC XXX: A YANG Data Model for LMAP Measurement Agents";
} }
rpc report { rpc report {
description description
"The report operation is used by an LMAP measurement agent to "The report operation is used by an LMAP measurement agent to
submit measurement results produced by measurement tasks to submit measurement results produced by measurement tasks to
a collector."; a collector.";
input { input {
leaf date { leaf date {
type yang:date-and-time; type yang:date-and-time;
mandatory true; mandatory true;
description description
"The date and time when this result report was sent to "The date and time when this result report was sent to
a collector."; a collector.";
} }
leaf agent-id { leaf agent-id {
type yang:uuid; type yang:uuid;
description description
"The agent-id of the agent from which this "The agent-id of the agent from which this
report originates."; report originates.";
} }
leaf group-id { leaf group-id {
type string; type string;
description description
"The group-id of the agent from which this "The group-id of the agent from which this
report originates."; report originates.";
} }
leaf measurement-point { leaf measurement-point {
type string; type string;
description description
"The measurement-point of the agent from which this "The measurement-point of the agent from which this
report originates."; report originates.";
} }
list task {
key name;
description
"The list of tasks for which results are reported.";
leaf name { list task {
type string; key name;
description description
"The unique name of the task."; "The list of tasks for which results are reported.";
}
uses lmap-common:metrics-grouping; leaf name {
type lmap:identifier;
description
"The unique name of the task.";
}
uses lmap-common:task-options-grouping { uses lmap:metrics-grouping;
description
"The list of task options there were in use then the
measurement was performed. This list must include
both the task specific options as well as the action
specific options.";
}
leaf-list tag { uses lmap:task-options-grouping {
type string; description
description "The list of task options there were in use then the
"A tag contains additional information that is passed measurement was performed. This list must include
with the result record to the collector. A tag can be both the task specific options as well as the action
used to carry the Measurement Cycle ID."; specific options.";
} }
container header { leaf-list tag {
description type lmap:tag;
"This container lists the column labels. It does not description
really serve a purpose other than making the result "A tag contains additional information that is passed
data look nicely structured."; with the result record to the collector. A tag can be
used to carry the Measurement Cycle ID.";
}
leaf-list column { container header {
type string; description
description "This container lists the column labels. It does not
"An ordered list of column labels. The order is determined really serve a purpose other than making the result
by the system and must match the order of the columns in data look nicely structured.";
the result rows.";
}
}
list row { leaf-list column {
description type string;
"The rows of the result record."; description
"An ordered list of column labels. The order is
determined by the system and must match the order
of the columns in the result rows.";
}
}
leaf start { list row {
type yang:date-and-time; description
mandatory true; "The rows of the result record.";
description
"The date and time when the measurement producing
this result row started.";
}
leaf end { leaf start {
type yang:date-and-time; type yang:date-and-time;
description mandatory true;
"The date and time when the measurement producing description
this result row stopped."; "The date and time when the measurement producing
} this result row started.";
}
leaf-list conflict { leaf end {
type string; type yang:date-and-time;
description description
"The name of a task overlapping with the execution "The date and time when the measurement producing
of the task that has produced this result record."; this result row stopped.";
} }
leaf-list value { leaf-list conflict {
type string; type string;
description description
"The value of a cell in the result row."; "The name of a task overlapping with the execution
} of the task that has produced this result record.";
} }
}
} leaf-list value {
} type string;
} description
<CODE ENDS> "The value of a cell in the result row.";
}
}
}
}
}
}
<CODE ENDS>
5. Security Considerations 5. Security Considerations
TBD The YANG module defined in this memo is designed to be accessed via
the NETCONF protocol [RFC6241]. The lowest NETCONF layer is the
secure transport layer and the mandatory to implement secure
transport is SSH [RFC6242]. The NETCONF access control model
[RFC6536] provides the means to restrict access for particular
NETCONF users to a pre-configured subset of all available NETCONF
protocol operations and content.
There are a number of data nodes defined in this YANG module which
are writable/creatable/deletable (i.e., config true, which is the
default). These data nodes may be considered sensitive or vulnerable
in some network environments. Write operations (e.g., edit-config)
to these data nodes without proper protection can have a negative
effect on network operations. These are the subtrees and data nodes
and their sensitivity/vulnerability:
/lmap/agent This subtree configures general properties of
the measurement agent such as its identity, its
measurement point or controller timeout. This
subtree should only have write access for the
system responsible to configure the measurement
agent.
/lmap/tasks This subtree configures the tasks that can be
invoked by a controller. This subtree should
only have write access for the system
responsible to configure the measurement agent.
Care must be taken to not expose tasks to a
controller that can cause damage to the system
or the network.
/lmap/schedules This subtree is used by a controller to define
the schedules and actions that are executed
when certain events occur. Unauthorized access
can cause unwanted load on the device or
network or it might direct measurement traffic
to targets that become victims of an attack.
/lmap/suppressions This subtree is used by a controller to define
suppressions that can temporarily disable the
execution of schedules or actions.
Unauthorized access can either disable
measurements that should normally take place or
it can cause measurements to take place during
times when normally no measurements should take
place.
/lmap/events This subtree is used by a controller to define
events that trigger the execution of schedules
and actions. Unauthorized access can either
disable measurements that should normally take
place or it can cause measurements to take
place during times when normally no
measurements should take place or at frequency
that is higher than normally expected.
Some of the readable data nodes in this YANG module may be considered
sensitive or vulnerable in some network environments. It is thus
important to control read access (e.g., via get, get-config or
notification) to these data nodes. These are the subtrees and data
nodes and their sensitivity/vulnerability:
/lmap-state/agent This subtree provides information about the
implementation (including version numbers).
This information may be used to mount
targeted attacks against the
implementation.
/lmap-state/tasks This subtree provides information about the
tasks (including version numbers). This
information may be used to mount targeted
attacks against the implementation.
/lmap-state/schedules This subtree provides information about the
schedules executed on the system. This
information may be used to check whether
attacks against the implementation are
effective.
/lmap-state/suppressions This subtree provides information about the
suppressions executed on the system. This
information may be used to predict time
periods where measurements take place (or
do not take place).
Some of the RPC operations in this YANG module may be considered
sensitive or vulnerable in some network environments. It is thus
important to control access to these operations. These are the
operations and their sensitivity/vulnerability:
/report The report operation is used to send locally collected
measurement results to a remote collector. Unauthorized
access may leak measurement results.
The data model uses a number of identifiers that are set by the
controller. Implementors may find these identifiers useful for the
identification of resources, e.g., to identify objects in a
filesystem providing temporary storage. Since the identifiers used
by the YANG data model may allow characters that may be given special
interpretation in a specific context, implementations MUST ensure
that identifiers are properly mapped into safe identifiers.
The data model allows to specify options in the form of name value
pairs that are passed to programs. Implementers MUST taken care that
option names and values are passed literally to programs. In
particular, it MUST be avoided that any shell expansions are
performed that may alter the option names and values.
6. IANA Considerations 6. IANA Considerations
This document registers a URI in the "IETF XML Registry" [RFC3688]. This document registers a URI in the "IETF XML Registry" [RFC3688].
Following the format in RFC 3688, the following registrations have Following the format in RFC 3688, the following registrations have
been made. been made.
URI: urn:ietf:params:xml:ns:yang:ietf-lmap-common
Registrant Contact: The IESG.
XML: N/A; the requested URI is an XML namespace.
URI: urn:ietf:params:xml:ns:yang:ietf-lmap-control URI: urn:ietf:params:xml:ns:yang:ietf-lmap-control
Registrant Contact: The IESG. Registrant Contact: The IESG.
XML: N/A; the requested URI is an XML namespace. XML: N/A; the requested URI is an XML namespace.
URI: urn:ietf:params:xml:ns:yang:ietf-lmap-report URI: urn:ietf:params:xml:ns:yang:ietf-lmap-report
Registrant Contact: The IESG. Registrant Contact: The IESG.
XML: N/A; the requested URI is an XML namespace. XML: N/A; the requested URI is an XML namespace.
This document registers a YANG module in the "YANG Module Names" This document registers a YANG module in the "YANG Module Names"
registry [RFC6020]. registry [RFC6020].
name: ietf-lmap-common name: ietf-lmap-common
namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-common namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-common
prefix: lmap-common prefix: lmap
reference: RFC XXXX reference: RFC XXXX
name: ietf-lmap-control name: ietf-lmap-control
namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-control namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-control
prefix: lmap-control prefix: lmapc
reference: RFC XXXX reference: RFC XXXX
name: ietf-lmap-report name: ietf-lmap-report
namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-report namespace: urn:ietf:params:xml:ns:yang:ietf-lmap-report
prefix: lmap-report prefix: lmapr
reference: RFC XXXX reference: RFC XXXX
7. Acknowledgements 7. Acknowledgements
Juergen Schoenwaelder and Vaibhav Bajpai worked in part on the Leone Juergen Schoenwaelder and Vaibhav Bajpai worked in part on the Leone
research project, which received funding from the European Union research project, which received funding from the European Union
Seventh Framework Programme [FP7/2007-2013] under grant agreement Seventh Framework Programme [FP7/2007-2013] under grant agreement
number 317647. number 317647.
Juergen Schoenwaelder and Vaibhav Bajpai were partly funded by Juergen Schoenwaelder and Vaibhav Bajpai were partly funded by
skipping to change at page 35, line 31 skipping to change at page 45, line 22
[I-D.ietf-netconf-server-model] [I-D.ietf-netconf-server-model]
Watsen, K. and J. Schoenwaelder, "NETCONF Server and Watsen, K. and J. Schoenwaelder, "NETCONF Server and
RESTCONF Server Configuration Models", draft-ietf-netconf- RESTCONF Server Configuration Models", draft-ietf-netconf-
server-model-08 (work in progress), October 2015. server-model-08 (work in progress), October 2015.
[RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688, [RFC3688] Mealling, M., "The IETF XML Registry", BCP 81, RFC 3688,
DOI 10.17487/RFC3688, January 2004, DOI 10.17487/RFC3688, January 2004,
<http://www.rfc-editor.org/info/rfc3688>. <http://www.rfc-editor.org/info/rfc3688>.
[RFC5424] Gerhards, R., "The Syslog Protocol", RFC 5424, DOI 10
.17487/RFC5424, March 2009,
<http://www.rfc-editor.org/info/rfc5424>.
[RFC6241] Enns, R., Ed., Bjorklund, M., Ed., Schoenwaelder, J., Ed.,
and A. Bierman, Ed., "Network Configuration Protocol
(NETCONF)", RFC 6241, DOI 10.17487/RFC6241, June 2011,
<http://www.rfc-editor.org/info/rfc6241>.
[RFC6242] Wasserman, M., "Using the NETCONF Protocol over Secure
Shell (SSH)", RFC 6242, DOI 10.17487/RFC6242, June 2011,
<http://www.rfc-editor.org/info/rfc6242>.
[RFC6536] Bierman, A. and M. Bjorklund, "Network Configuration
Protocol (NETCONF) Access Control Model", RFC 6536, DOI 10
.17487/RFC6536, March 2012,
<http://www.rfc-editor.org/info/rfc6536>.
[RFC7223] Bjorklund, M., "A YANG Data Model for Interface [RFC7223] Bjorklund, M., "A YANG Data Model for Interface
Management", RFC 7223, DOI 10.17487/RFC7223, May 2014, Management", RFC 7223, DOI 10.17487/RFC7223, May 2014,
<http://www.rfc-editor.org/info/rfc7223>. <http://www.rfc-editor.org/info/rfc7223>.
[RFC7398] Bagnulo, M., Burbridge, T., Crawford, S., Eardley, P., and [RFC7398] Bagnulo, M., Burbridge, T., Crawford, S., Eardley, P., and
A. Morton, "A Reference Path and Measurement Points for A. Morton, "A Reference Path and Measurement Points for
Large-Scale Measurement of Broadband Performance", RFC Large-Scale Measurement of Broadband Performance", RFC
7398, DOI 10.17487/RFC7398, February 2015, 7398, DOI 10.17487/RFC7398, February 2015,
<http://www.rfc-editor.org/info/rfc7398>. <http://www.rfc-editor.org/info/rfc7398>.
[RFC7594] Eardley, P., Morton, A., Bagnulo, M., Burbridge, T., [RFC7594] Eardley, P., Morton, A., Bagnulo, M., Burbridge, T.,
Aitken, P., and A. Akhter, "A Framework for Large-Scale Aitken, P., and A. Akhter, "A Framework for Large-Scale
Measurement of Broadband Performance (LMAP)", RFC 7594, Measurement of Broadband Performance (LMAP)", RFC 7594,
DOI 10.17487/RFC7594, September 2015, DOI 10.17487/RFC7594, September 2015,
<http://www.rfc-editor.org/info/rfc7594>. <http://www.rfc-editor.org/info/rfc7594>.
Appendix A. Open Issues Appendix A. Open Issues
o The task-options-grouping needs fixing, see the comments inline. A.1. Purpose of /lmap-state/tasks
Appendix B. Non-editorial Changes since -01 Proposal: Tasks are configured in /lmap/tasks and even marked as nacm
:default-deny-write (see RFC 6536) since configuring programs that
can be invoked by a controller is an operation that may impact the
security of the device. See also the related open issue on the
information model. If we do this, then /lmap-state/tasks should
probably only report the version number.
A.2. Streamline the reporting model
The reporting model may need more attention; perhaps things can be
streamlined and also be made more efficient. Implementation
experience will help to work this out.
Appendix B. Non-editorial Changes since -02
o Added a mechanism to enforce a runtime limit for schedules.
o Added security considerations text warning about possible shell
expansions of options.
o Restricted all user-defined names and tags to lmap:identifier.
Added security considerations text to make implementors aware of
possible security issues if identifiers are naively mapped to say
filesystem paths.
o Schedules and actions now have tags (echoed to the collector) and
suppression tags (used for suppression selection).
o Introduced glob-style pattern to match tags.
o Added an example module for IPPM udp latency metrics to
demonstrate the usage of the extension mechanism.
o Introduced parameters, an extension point for task/metric specific
parameters defined in augmenting YANG modules.
o Introduced the typedefs event-ref, task-ref, and schedule-ref.
o Changed schedule/event to schedule/start and added the optional
schedule/stop and schedule/duration leafs.
Appendix C. Non-editorial Changes since -01
o Updated and split examples (config vs state vs report). o Updated and split examples (config vs state vs report).
o Refactored the definitions so that common definitions used by both o Refactored the definitions so that common definitions used by both
the control and report data models are in the new module ietf- the control and report data models are in the new module ietf-
lmap-common. lmap-common.
o A report is submitted via an RPC operation instead of using a o A report is submitted via an RPC operation instead of using a
notification. notification.
skipping to change at page 36, line 39 skipping to change at page 47, line 42
o Added controller-lost an controller-ok event choices to /lmap/ o Added controller-lost an controller-ok event choices to /lmap/
events/event. events/event.
o Added a metrics-grouping to identify entries in a metric registry o Added a metrics-grouping to identify entries in a metric registry
and associated roles. and associated roles.
o Added /lmap-state/schedules to report the status of schedules and o Added /lmap-state/schedules to report the status of schedules and
their actions. Refactored /lmap-state/tasks to only report the their actions. Refactored /lmap-state/tasks to only report the
task capabilities. task capabilities.
Appendix C. Non-editorial Changes since -00 Appendix D. Non-editorial Changes since -00
o A task can now reference multiply registry entries. o A task can now reference multiply registry entries.
o Schedules are triggered by Events instead of Timings; Timings are o Schedules are triggered by Events instead of Timings; Timings are
just one of many possible event sources. just one of many possible event sources.
o Actions feed into other Schedules (instead of Actions within other o Actions feed into other Schedules (instead of Actions within other
Schedules). Schedules).
o Removed the notion of multiple task outputs. o Removed the notion of multiple task outputs.
o Support for sequential, parallel, and pipelined execution of o Support for sequential, parallel, and pipelined execution of
Actions. Actions.
Appendix D. Example Configuration (XML) Appendix E. Example IPPM Module for UDP Latency Metrics
<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> module example-ietf-ippm-udp-latency {
<lmap xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-control">
<agent> namespace "urn:example:ietf-ippm-udp-latency";
<agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id> prefix "ippm-udp-latency";
<device-id>urn:dev:mac:0024befffe804ff1</device-id>
<group-id>wireless measurement at the north-pole</group-id>
<report-agent-id>true</report-agent-id>
</agent>
<schedules> import ietf-inet-types {
prefix inet;
}
<schedule> import ietf-lmap-control {
<name>hourly-schedule</name> prefix "lmap";
<event>hourly</event> }
<action>
<name>icmp-latency-hourly</name>
<task>icmp-latency-measurement</task>
<destination>daily-schedule</destination>
</action>
<action>
<name>udp-latency-weekdays-hourly</name>
<task>udp-latency-measurement</task>
<destination>daily-schedule</destination>
</action>
<execution-mode>sequential</execution-mode>
</schedule>
<schedule> augment "/lmap:lmap/lmap:schedules/lmap:schedule/lmap:action"
<name>daily-schedule</name> + "/lmap:parameters/lmap:extension" {
<event>daily</event> description
<action> "This augmentation adds parameters specific to IPPM UDP
<name>report-daily</name> latency metrics.";
<task>lmap-reporting-task</task>
<option>
<name>channel</name>
<value>http://collector.example.org/</value>
</option>
</action>
<execution-mode>sequential</execution-mode>
</schedule>
<schedule> case "ietf-ippm-udp-latency" {
<name>immediate-schedule</name> leaf src-ip {
<event>immediate</event> type inet:ip-address;
<action> description
<name>icmp-latency-immediate</name> "The source IP address of the UDP measurement traffic.";
<task>icmp-latency-measurement</task> }
</action>
<action>
<name>report-immediate</name>
<task>lmap-reporting-task</task>
<option>
<name>channel</name>
<value>http://collector.example.org/</value>
</option>
</action>
<execution-mode>pipelined</execution-mode>
</schedule>
</schedules>
<suppressions> leaf src-port {
<suppression> type inet:port-number;
<name>controller-lost-suppression</name> description
<start>controller-lost</start> "The source port number of the UDP measurement traffic.";
<end>controller-ok</end> }
<tag>*</tag>
</suppression>
</suppressions>
<tasks> leaf dst-ip {
<task> type inet:ip-address;
<name>udp-latency-measurement</name> description
<metric> "The destination IP address of the UDP measurement traffic.";
<uri>urn:....</uri> }
<role>source</role>
</metric>
</task>
<task>
<name>icmp-latency-measurement</name>
<metric>
<uri>urn:....</uri>
</metric>
</task>
<task>
<name>iperf-server</name>
<program>/usr/bin/iperf</program>
<option>
<name>role</name>
<value>server</value>
</option>
<suppress-by-default>false</suppress-by-default>
</task>
<task>
<name>lmap-reporting-task</name>
<program>/usr/bin/lmap-reporter</program>
</task>
</tasks>
<events> leaf dst-port {
<event> type inet:port-number;
<name>hourly</name> description
<periodic> "The destination port number of the UDP measurement traffic.";
<interval>3600000</interval>
<start>2014-09-01T17:44:00+02:00</start>
<end>2015-09-30T00:00:00+02:00</end>
</periodic>
</event>
<event>
<name>daily</name>
<calendar>
<hour>4</hour>
</calendar>
</event>
<event>
<name>once-every-six-hours</name>
<calendar>
<hour>0</hour>
<hour>6</hour>
<hour>12</hour>
<hour>18</hour>
<minute>0</minute>
<second>0</second>
<end>2014-09-30T00:00:00+02:00</end>
</calendar>
<random-spread>21600000</random-spread>
</event>
<event>
<name>immediate</name>
<immediate/>
</event>
<event>
<name>startup</name>
<startup/>
<random-spread>12345</random-spread>
</event>
<event>
<name>controller-lost</name>
<controller-lost/>
</event>
<event>
<name>controller-ok</name>
<controller-ok/>
</event>
</events>
</lmap> }
</config>
Appendix E. Example Configuration (JSON) leaf poisson-lambda {
type decimal64 {
fraction-digits 4;
}
units "seconds";
default 1.0000;
description
"The average interval for the poisson stream with a resolution
of 0.0001 seconds (0.1 ms).";
}
{ leaf poisson-limit {
"ietf-lmap-control:lmap": { type decimal64 {
"agent": { fraction-digits 4;
"agent-id": "550e8400-e29b-41d4-a716-446655440000", }
"device-id": "urn:dev:mac:0024befffe804ff1", units "seconds";
"group-id": "wireless measurement at the north-pole", default 30.0000;
"report-agent-id": true description
}, "The upper limit on the poisson distribution with a resolution
"schedules": { of 0.0001 seconds (0.1 ms).";
"schedule": [ }
{ }
"name": "hourly-schedule", }
"event": "hourly", }
"action": [
{
"name": "icmp-latency-hourly",
"task": "icmp-latency-measurement",
"destination": [
"daily-schedule"
]
},
{
"name": "udp-latency-weekdays-hourly",
"task": "udp-latency-measurement",
"destination": [
"daily-schedule"
]
}
],
"execution-mode": "sequential"
},
{
"name": "daily-schedule",
"event": "daily",
"action": [
{
"name": "report-daily",
"task": "lmap-reporting-task",
"option": [
{
"name": "channel",
"value": "http://collector.example.org/"
}
]
}
],
"execution-mode": "sequential"
},
{
"name": "immediate-schedule",
"event": "immediate",
"action": [
{
"name": "icmp-latency-immediate",
"task": "icmp-latency-measurement"
},
{
"name": "report-immediate",
"task": "lmap-reporting-task",
"option": [
{
"name": "channel",
"value": "http://collector.example.org/"
}
]
}
],
"execution-mode": "pipelined"
}
]
},
"suppressions": {
"suppression": [
{
"name": "controller-lost-suppression",
"start": "controller-lost",
"end": "controller-ok",
"tag": [
"*"
]
}
]
},
"tasks": {
"task": [
{
"name": "udp-latency-measurement",
"metric": [
{
"uri": "urn:....",
"role": [
"source"
]
}
]
},
{
"name": "icmp-latency-measurement",
"metric": [
{
"uri": "urn:...."
}
]
},
{
"name": "iperf-server",
"program": "/usr/bin/iperf",
"option": [
{
"name": "role",
"value": "server"
}
],
"suppress-by-default": false
},
{
"name": "lmap-reporting-task",
"program": "/usr/bin/lmap-reporter"
}
]
},
"events": {
"event": [
{
"name": "hourly",
"periodic": {
"interval": 3600000,
"start": "2014-09-01T17:44:00+02:00",
"end": "2015-09-30T00:00:00+02:00"
}
},
{
"name": "daily",
"calendar": {
"hour": [
4
]
}
},
{
"name": "once-every-six-hours",
"calendar": {
"hour": [
0,
6,
12,
18
],
"minute": [
0
],
"second": [
0
],
"end": "2014-09-30T00:00:00+02:00"
},
"random-spread": 21600000
},
{
"name": "immediate",
"immediate": [null]
},
{
"name": "startup",
"startup": [null],
"random-spread": 12345
},
{
"name": "controller-lost",
"controller-lost": [null]
},
{
"name": "controller-ok",
"controller-ok": [null]
}
]
}
}
}
Appendix F. Example State (XML) Appendix F. Example Configuration (XML)
<config xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<lmap xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-control">
<agent>
<agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id>
<device-id>urn:dev:mac:0024befffe804ff1</device-id>
<group-id>network measurement at the north-pole</group-id>
<report-agent-id>true</report-agent-id>
</agent>
<tasks>
<!-- configuration of an iperf server task -->
<task>
<name>iperf-server</name>
<program>/usr/bin/iperf</program>
<option>
<id>server</id>
<name>-s</name>
</option>
<tag>passive</tag>
<tag>iperf</tag>
</task>
<!-- configuration of an iperf client task -->
<task>
<name>iperf-client</name>
<program>/usr/bin/iperf</program>
<option>
<id>client</id>
<name>-c</name>
</option>
<tag>active</tag>
<tag>iperf</tag>
</task>
<!-- configuration of a reporter task -->
<task>
<name>lmap-reporting-task</name>
<program>/usr/bin/lmap-reporter</program>
<option>
<id>collector-uri</id>
<value>https://example.com/restconf/operations/ietf-lmap-report:report</value>
</option>
</task>
<task>
<name>fcc-measurement-suite</name>
<program>/usr/bin/fcc-suite</program>
</task>
<task>
<name>ippm-udp-latency-client</name>
<program>/usr/bin/ippm-udp-latency</program>
<metric>
<uri>urn:example:what?</uri>
<role>client</role>
</metric>
<tag>active</tag>
</task>
</tasks>
<schedules>
<!-- execute the fcc measurement suite during (Sep 2016) -->
<schedule>
<name>fcc-campain-2016</name>
<start>fcc-hourly-sep-2016</start>
<duration>600</duration>
<execution-mode>pipelined</execution-mode>
<action>
<name>fcc-measurement</name>
<task>fcc-measurement-suite</task>
</action>
<action>
<name>fcc-report</name>
<task>lmap-reporting-task</task>
<option>
<id>collector-uri</id>
<value>https://fcc.example.com/restconf/operations/ietf-lmap-report:report</value>
</option>
</action>
</schedule>
<!-- run two iperf measurements sequentially against mlab1 and
mlab2 and feed the results into our result reporting tasks -->
<schedule>
<name>iperf-hourly</name>
<start>hourly</start>
<execution-mode>sequential</execution-mode>
<action>
<name>iperf-hourly-mlab1</name>
<task>iperf-client</task>
<option>
<id>mlab1</id>
<value>mlab1.example.com</value>
</option>
</action>
<action>
<name>iperf-hourly-mlab2</name>
<task>iperf-client</task>
<option>
<id>mlab2</id>
<value>mlab2.example.com</value>
</option>
<destination>report-collector</destination>
<destination>report-shadow-collector</destination>
</action>
</schedule>
<!-- start an iperf server on startup -->
<schedule>
<name>startup</name>
<start>startup</start>
<action>
<name>iperf-server</name>
<task>iperf-server</task>
</action>
</schedule>
<!-- report results every six hours to our main collector -->
<schedule>
<name>report-collector</name>
<start>once-every-six-hours</start>
<action>
<name>report-action</name>
<task>lmap-reporting-task</task>
<option>
<id>collector-uri</id>
<value>https://collector.example.com/restconf/operations/ietf-lmap-report:report</value>
</option>
</action>
</schedule>
<!-- report results once per day to our shadow collector -->
<schedule>
<name>report-shadow-collector</name>
<start>daily</start>
<action>
<name>report-action</name>
<task>lmap-reporting-task</task>
<option>
<id>collector-uri</id>
<value>https://shadow.example.com/restconf/operations/ietf-lmap-report:report</value>
</option>
</action>
</schedule>
<!-- IPPM udp latency measurement -->
<schedule>
<name>ippm-udp-latency</name>
<start>hourly</start>
<execution-mode>sequential</execution-mode>
<action>
<name>ippm-udp-latency</name>
<task>ippm-udp-latency-client</task>
<parameters xmlns:udp="urn:example:ietf-ippm-udp-latency">
<udp:src-ip>192.0.2.1</udp:src-ip>
<udp:src-port>54321</udp:src-port>
<udp:dst-ip>192.0.2.2</udp:dst-ip>
<udp:dst-port>12345</udp:dst-port>
<udp:poisson-lambda>42</udp:poisson-lambda>
</parameters>
</action>
<action>
<name>ippm-udp-latency-report</name>
<task>lmap-reporting-task</task>
<option>
<id>collector-uri</id>
<value>https://ippm.example.com/restconf/operations/ietf-lmap-report:report</value>
</option>
</action>
</schedule>
</schedules>
<suppressions>
<!-- stop all measurements if we got orphaned -->
<suppression>
<name>orphaned</name>
<start>controller-lost</start>
<end>controller-connected</end>
<match>*</match>
</suppression>
<!-- stop all active measurements during new year's evening -->
<suppression>
<name>new-year-evening</name>
<start>dec-31-11:00</start>
<end>jan-01-15:00</end>
<match>active</match>
</suppression>
</suppressions>
<events>
<event>
<name>fcc-hourly-sep-2016</name>
<periodic>
<interval>3600000</interval>
<start>2016-09-01T00:00:00+00:00</start>
<end>2016-10-01T00:00:00+00:00</end>
</periodic>
<random-spread>300000</random-spread> <!-- ms -->
</event>
<event>
<name>monthly</name>
<calendar>
<month>*</month>
<day-of-week>*</day-of-week>
<day-of-month>1</day-of-month>
<hour>0</hour>
<minute>0</minute>
<second>0</second>
<timezone-offset>+00:00</timezone-offset>
</calendar>
</event>
<event>
<name>weekly</name>
<calendar>
<month>*</month>
<day-of-week>monday</day-of-week>
<day-of-month>*</day-of-month>
<hour>0</hour>
<minute>0</minute>
<second>0</second>
<timezone-offset>+00:00</timezone-offset>
</calendar>
</event>
<event>
<name>daily</name>
<calendar>
<month>*</month>
<day-of-week>*</day-of-week>
<day-of-month>*</day-of-month>
<hour>0</hour>
<minute>0</minute>
<second>0</second>
<timezone-offset>+00:00</timezone-offset>
</calendar>
</event>
<event>
<name>hourly</name>
<calendar>
<month>*</month>
<day-of-month>*</day-of-month>
<day-of-week>*</day-of-week>
<hour>*</hour>
<minute>0</minute>
<second>0</second>
<timezone-offset>+00:00</timezone-offset>
</calendar>
</event>
<event>
<name>once-every-six-hours</name>
<calendar>
<month>*</month>
<day-of-month>*</day-of-month>
<day-of-week>*</day-of-week>
<hour>0</hour>
<hour>6</hour>
<hour>12</hour>
<hour>18</hour>
<minute>0</minute>
<second>0</second>
</calendar>
<random-spread>3600000</random-spread>
</event>
<event>
<name>dec-31-11:00</name>
<calendar>
<month>december</month>
<day-of-month>31</day-of-month>
<day-of-week>*</day-of-week>
<hour>11</hour>
<minute>00</minute>
<second>00</second>
</calendar>
</event>
<event>
<name>jan-01-15:00</name>
<calendar>
<month>january</month>
<day-of-month>1</day-of-month>
<day-of-week>*</day-of-week>
<hour>15</hour>
<minute>00</minute>
<second>00</second>
</calendar>
</event>
<event>
<name>startup</name>
<startup/>
<!-- avoid synchronization issues -->
<random-spread>12345</random-spread>
</event>
<event>
<name>controller-lost</name>
<controller-lost/>
</event>
<event>
<name>controller-connected</name>
<controller-connected/>
<!-- avoid synchronization issues -->
<random-spread>12345</random-spread>
</event>
</events>
</lmap>
</config>
Appendix G. Example Configuration (JSON)
{
"ietf-lmap-control:lmap": {
"agent": {
"agent-id": "550e8400-e29b-41d4-a716-446655440000",
"device-id": "urn:dev:mac:0024befffe804ff1",
"group-id": "network measurement at the north-pole",
"report-agent-id": true
},
"tasks": {
"task": [
{
"name": "iperf-server",
"program": "/usr/bin/iperf",
"option": [
{
"id": "server",
"name": "-s"
}
],
"tag": [
"passive",
"iperf"
]
},
{
"name": "iperf-client",
"program": "/usr/bin/iperf",
"option": [
{
"id": "client",
"name": "-c"
}
],
"tag": [
"active",
"iperf"
]
},
{
"name": "lmap-reporting-task",
"program": "/usr/bin/lmap-reporter",
"option": [
{
"id": "collector-uri",
"value": "https://example.com/restconf/operations/ietf-lmap-report:report"
}
]
},
{
"name": "fcc-measurement-suite",
"program": "/usr/bin/fcc-suite"
},
{
"name": "ippm-udp-latency-client",
"program": "/usr/bin/ippm-udp-latency",
"metric": [
{
"uri": "urn:example:what?",
"role": [
"client"
]
}
],
"tag": [
"active"
]
}
]
},
"schedules": {
"schedule": [
{
"name": "fcc-campain-2016",
"start": "fcc-hourly-sep-2016",
"duration": 600,
"execution-mode": "pipelined",
"action": [
{
"name": "fcc-measurement",
"task": "fcc-measurement-suite"
},
{
"name": "fcc-report",
"task": "lmap-reporting-task",
"option": [
{
"id": "collector-uri",
"value": "https://fcc.example.com/restconf/operations/ietf-lmap-report:report"
}
]
}
]
},
{
"name": "iperf-hourly",
"start": "hourly",
"execution-mode": "sequential",
"action": [
{
"name": "iperf-hourly-mlab1",
"task": "iperf-client",
"option": [
{
"id": "mlab1",
"value": "mlab1.example.com"
}
]
},
{
"name": "iperf-hourly-mlab2",
"task": "iperf-client",
"option": [
{
"id": "mlab2",
"value": "mlab2.example.com"
}
],
"destination": [
"report-collector",
"report-shadow-collector"
]
}
]
},
{
"name": "startup",
"start": "startup",
"action": [
{
"name": "iperf-server",
"task": "iperf-server"
}
]
},
{
"name": "report-collector",
"start": "once-every-six-hours",
"action": [
{
"name": "report-action",
"task": "lmap-reporting-task",
"option": [
{
"id": "collector-uri",
"value": "https://collector.example.com/restconf/operations/ietf-lmap-report:report"
}
]
}
]
},
{
"name": "report-shadow-collector",
"start": "daily",
"action": [
{
"name": "report-action",
"task": "lmap-reporting-task",
"option": [
{
"id": "collector-uri",
"value": "https://shadow.example.com/restconf/operations/ietf-lmap-report:report"
}
]
}
]
},
{
"name": "ippm-udp-latency",
"start": "hourly",
"execution-mode": "sequential",
"action": [
{
"name": "ippm-udp-latency",
"task": "ippm-udp-latency-client",
"parameters": {
"src-ip": "192.0.2.1",
"src-port": 54321,
"dst-ip": "192.0.2.2",
"dst-port": 12345,
"poisson-lambda": "42"
}
},
{
"name": "ippm-udp-latency-report",
"task": "lmap-reporting-task",
"option": [
{
"id": "collector-uri",
"value": "https://ippm.example.com/restconf/operations/ietf-lmap-report:report"
}
]
}
]
}
]
},
"suppressions": {
"suppression": [
{
"name": "orphaned",
"start": "controller-lost",
"end": "controller-connected",
"match": [
"*"
]
},
{
"name": "new-year-evening",
"start": "dec-31-11:00",
"end": "jan-01-15:00",
"match": [
"active"
]
}
]
},
"events": {
"event": [
{
"name": "fcc-hourly-sep-2016",
"periodic": {
"interval": 3600000,
"start": "2016-09-01T00:00:00+00:00",
"end": "2016-10-01T00:00:00+00:00"
},
"random-spread": 300000
},
{
"name": "monthly",
"calendar": {
"month": [
"*"
],
"day-of-week": [
"*"
],
"day-of-month": [
1
],
"hour": [
0
],
"minute": [
0
],
"second": [
0
],
"timezone-offset": "+00:00"
}
},
{
"name": "weekly",
"calendar": {
"month": [
"*"
],
"day-of-week": [
"monday"
],
"day-of-month": [
"*"
],
"hour": [
0
],
"minute": [
0
],
"second": [
0
],
"timezone-offset": "+00:00"
}
},
{
"name": "daily",
"calendar": {
"month": [
"*"
],
"day-of-week": [
"*"
],
"day-of-month": [
"*"
],
"hour": [
0
],
"minute": [
0
],
"second": [
0
],
"timezone-offset": "+00:00"
}
},
{
"name": "hourly",
"calendar": {
"month": [
"*"
],
"day-of-month": [
"*"
],
"day-of-week": [
"*"
],
"hour": [
"*"
],
"minute": [
0
],
"second": [
0
],
"timezone-offset": "+00:00"
}
},
{
"name": "once-every-six-hours",
"calendar": {
"month": [
"*"
],
"day-of-month": [
"*"
],
"day-of-week": [
"*"
],
"hour": [
0,
6,
12,
18
],
"minute": [
0
],
"second": [
0
]
},
"random-spread": 3600000
},
{
"name": "dec-31-11:00",
"calendar": {
"month": [
"december"
],
"day-of-month": [
31
],
"day-of-week": [
"*"
],
"hour": [
11
],
"minute": [
00
],
"second": [
00
]
}
},
{
"name": "jan-01-15:00",
"calendar": {
"month": [
"january"
],
"day-of-month": [
1
],
"day-of-week": [
"*"
],
"hour": [
15
],
"minute": [
00
],
"second": [
00
]
}
},
{
"name": "startup",
"startup": [null],
"random-spread": 12345
},
{
"name": "controller-lost",
"controller-lost": [null]
},
{
"name": "controller-connected",
"controller-connected": [null],
"random-spread": 12345
}
]
}
}
}
Appendix H. Example State (XML)
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"> <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<lmap-state xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-control"> <lmap-state xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-control">
<agent> <agent>
<agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id> <agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id>
<device-id>urn:dev:mac:0024befffe804ff1</device-id> <device-id>urn:dev:mac:0024befffe804ff1</device-id>
<hardware>ACME home router</hardware> <hardware>ACME home router</hardware>
<firmware>OpenWrt version 10.03.1</firmware> <firmware>OpenWrt version 10.03.1</firmware>
<version>Measurement Agent Daemon (MAD) 4.2</version> <version>Measurement Agent Daemon (MAD) 4.2</version>
skipping to change at page 45, line 30 skipping to change at page 66, line 30
<last-message>OK</last-message> <last-message>OK</last-message>
<last-failed-completion>2015-01-23T03:00:00+01:00</last-failed-completion> <last-failed-completion>2015-01-23T03:00:00+01:00</last-failed-completion>
<last-failed-status>42</last-failed-status> <last-failed-status>42</last-failed-status>
<last-failed-message>connection timed out</last-failed-message> <last-failed-message>connection timed out</last-failed-message>
</action> </action>
</schedule> </schedule>
</schedules> </schedules>
</lmap-state> </lmap-state>
</data> </data>
Appendix G. Example State (JSON) Appendix I. Example State (JSON)
{ {
"ietf-lmap-control:lmap-state": { "ietf-lmap-control:lmap-state": {
"agent": { "agent": {
"agent-id": "550e8400-e29b-41d4-a716-446655440000", "agent-id": "550e8400-e29b-41d4-a716-446655440000",
"device-id": "urn:dev:mac:0024befffe804ff1", "device-id": "urn:dev:mac:0024befffe804ff1",
"hardware": "ACME home router", "hardware": "ACME home router",
"firmware": "OpenWrt version 10.03.1", "firmware": "OpenWrt version 10.03.1",
"version": "Measurement Agent Daemon (MAD) 4.2", "version": "Measurement Agent Daemon (MAD) 4.2",
"last-started": "2015-04-10T17:24:42+02:00" "last-started": "2015-04-10T17:24:42+02:00"
skipping to change at page 47, line 15 skipping to change at page 68, line 15
"last-failed-status": 42, "last-failed-status": 42,
"last-failed-message": "connection timed out" "last-failed-message": "connection timed out"
} }
] ]
} }
] ]
} }
} }
} }
Appendix H. Example Report (XML) Appendix J. Example Report (XML)
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" <rpc xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"
message-id="1"> message-id="1">
<report xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-report"> <report xmlns="urn:ietf:params:xml:ns:yang:ietf-lmap-report">
<date>2015-10-28T13:27:42+02:00</date> <date>2015-10-28T13:27:42+02:00</date>
<agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id> <agent-id>550e8400-e29b-41d4-a716-446655440000</agent-id>
<group-id>wireless measurement at the north-pole</group-id> <group-id>wireless measurement at the north-pole</group-id>
<task> <task>
<name>icmp-latency-measurement</name> <name>icmp-latency-measurement</name>
skipping to change at page 50, line 31 skipping to change at page 71, line 31
<value>80</value> <value>80</value>
<value>216.58.213.36</value> <value>216.58.213.36</value>
<value>11692</value> <value>11692</value>
<value>11668</value> <value>11668</value>
<value>11933</value> <value>11933</value>
</row> </row>
</task> </task>
</report> </report>
</rpc> </rpc>
Appendix I. Example Report (JSON) Appendix K. Example Report (JSON)
{ {
"report": { "report": {
"date": "2015-10-28T13:27:42+02:00", "date": "2015-10-28T13:27:42+02:00",
"agent-id": "550e8400-e29b-41d4-a716-446655440000", "agent-id": "550e8400-e29b-41d4-a716-446655440000",
"group-id": "wireless measurement at the north-pole", "group-id": "wireless measurement at the north-pole",
"task": [ "task": [
{ {
"name": "icmp-latency-measurement", "name": "icmp-latency-measurement",
"header": { "header": {
 End of changes. 176 change blocks. 
898 lines changed or deleted 1878 lines changed or added

This html diff was produced by rfcdiff 1.44. The latest version is available from http://tools.ietf.org/tools/rfcdiff/