projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from OSM SO master
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
yang
/
rw-pkg-mgmt.yang
diff --git
a/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
b/rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
index
5fbd621
..
ee3b7d1
100644
(file)
--- a/
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
+++ b/
rwlaunchpad/plugins/yang/rw-pkg-mgmt.yang
@@
-1,6
+1,6
@@
/*
*
/*
*
- * Copyright 2016 RIFT.IO Inc
+ * Copyright 2016
-2017
RIFT.IO Inc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-56,10
+56,24
@@
module rw-pkg-mgmt
import rw-vnfd {
prefix "rwvnfd";
}
import rw-vnfd {
prefix "rwvnfd";
}
+
import rw-nsd {
prefix "rwnsd";
}
import rw-nsd {
prefix "rwnsd";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import rw-project-mano {
+ prefix "rw-project-mano";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2016-06-01 {
description
"Initial revision.";
revision 2016-06-01 {
description
"Initial revision.";
@@
-190,45
+204,47
@@
module rw-pkg-mgmt
}
}
}
}
- container download-jobs {
- rwpb:msg-new DownloadJobs;
- description "Download jobs";
- config false;
+ augment "/rw-project:project" {
+ container download-jobs {
+ rwpb:msg-new DownloadJobs;
+ description "Download jobs";
+ config false;
- list job {
- rwpb:msg-new DownloadJob;
- key "download-id";
+
list job {
+
rwpb:msg-new DownloadJob;
+
key "download-id";
- leaf download-id {
- description "Unique UUID";
- type string;
- }
+
leaf download-id {
+
description "Unique UUID";
+
type string;
+
}
- leaf url {
- description "URL of the download";
- type string;
- }
+
leaf url {
+
description "URL of the download";
+
type string;
+
}
- uses package-file-identifer;
- uses download-task-status;
+ uses package-file-identifer;
+ uses download-task-status;
+ }
}
}
- }
- container copy-jobs {
- rwpb:msg-new CopyJobs;
- description "Copy jobs";
- config false;
+
container copy-jobs {
+
rwpb:msg-new CopyJobs;
+
description "Copy jobs";
+
config false;
- list job {
- rwpb:msg-new CopyJob;
- key "transaction-id";
+
list job {
+
rwpb:msg-new CopyJob;
+
key "transaction-id";
- leaf transaction-id {
- description "Unique UUID";
- type string;
- }
+
leaf transaction-id {
+
description "Unique UUID";
+
type string;
+
}
- uses copy-task-status;
+ uses copy-task-status;
+ }
}
}
}
}
@@
-237,6
+253,7
@@
module rw-pkg-mgmt
input {
uses package-identifer;
input {
uses package-identifer;
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-257,6
+274,8
@@
module rw-pkg-mgmt
description "Name of destination package";
type string;
}
description "Name of destination package";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-277,6
+296,8
@@
module rw-pkg-mgmt
description "Type of the package";
type manotypes:package-type;
}
description "Type of the package";
type manotypes:package-type;
}
+
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-293,6
+314,7
@@
module rw-pkg-mgmt
input {
uses package-identifer;
uses external-url-data;
input {
uses package-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-300,6
+322,7
@@
module rw-pkg-mgmt
description "Valid ID to track the status of the task";
type string;
}
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
}
}
@@
-309,6
+332,7
@@
module rw-pkg-mgmt
input {
uses package-identifer;
uses external-url-data;
input {
uses package-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-316,6
+340,7
@@
module rw-pkg-mgmt
description "Valid ID to track the status of the task";
type string;
}
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
}
}
@@
-324,6
+349,7
@@
module rw-pkg-mgmt
input {
uses package-identifer;
input {
uses package-identifer;
+ uses manotypes:rpc-project-name;
leaf export-schema {
description "Schema to export";
leaf export-schema {
description "Schema to export";
@@
-342,7
+368,6
@@
module rw-pkg-mgmt
type export-format;
default YAML;
}
type export-format;
default YAML;
}
-
}
output {
}
output {
@@
-355,6
+380,8
@@
module rw-pkg-mgmt
description "Valid ID to track the status of the task";
type string;
}
description "Valid ID to track the status of the task";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
}
}
}
@@
-364,6
+391,7
@@
module rw-pkg-mgmt
input {
uses package-file-identifer;
uses external-url-data;
input {
uses package-file-identifer;
uses external-url-data;
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-371,6
+399,7
@@
module rw-pkg-mgmt
description "Valid ID to track the status of the task";
type string;
}
description "Valid ID to track the status of the task";
type string;
}
+ uses manotypes:rpc-project-name;
}
}
}
}
@@
-379,6
+408,7
@@
module rw-pkg-mgmt
input {
uses package-file-identifer;
input {
uses package-file-identifer;
+ uses manotypes:rpc-project-name;
}
output {
}
output {
@@
-392,6
+422,7
@@
module rw-pkg-mgmt
type string;
}
type string;
}
+ uses manotypes:rpc-project-name;
}
}
}
}