projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated changes from IM module to introduce operational state upgrading
[osm/SO.git]
/
common
/
plugins
/
yang
/
rw-cloud.yang
diff --git
a/common/plugins/yang/rw-cloud.yang
b/common/plugins/yang/rw-cloud.yang
index
e4682ac
..
c3aa5e3
100644
(file)
--- a/
common/plugins/yang/rw-cloud.yang
+++ b/
common/plugins/yang/rw-cloud.yang
@@
-1,7
+1,7
@@
/*
*
/*
*
- * 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.
@@
-23,11
+23,6
@@
module rw-cloud
namespace "http://riftio.com/ns/riftware-1.0/rw-cloud";
prefix "rw-cloud";
namespace "http://riftio.com/ns/riftware-1.0/rw-cloud";
prefix "rw-cloud";
-
- import rw-pb-ext {
- prefix "rw-pb-ext";
- }
-
import rwcal {
prefix "rwcal";
}
import rwcal {
prefix "rwcal";
}
@@
-36,36
+31,50
@@
module rw-cloud
prefix "rw-sdn";
}
prefix "rw-sdn";
}
+ import mano-types {
+ prefix "manotypes";
+ }
+
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2015-09-14 {
description
"Initial revision.";
}
revision 2015-09-14 {
description
"Initial revision.";
}
- container cloud {
- rw-pb-ext:msg-new CloudConfig;
- list account {
- rw-pb-ext:msg-new CloudAccount;
- description "Configure Cloud Accounts";
+ augment "/rw-project:project" {
+ container cloud {
+ list account {
+ description "Configure Cloud Accounts";
- max-elements 16;
- key "name";
+
max-elements 16;
+
key "name";
- leaf name {
- mandatory true;
- type string {
+
leaf name {
+
mandatory true;
+
type string {
length "1..255";
length "1..255";
+ }
}
}
- }
- leaf sdn-account {
- description "Configured SDN account associated with this cloud account";
- type leafref {
- path "/rw-sdn:sdn-account/rw-sdn:name";
+ leaf sdn-account {
+ description "Configured SDN account associated with this cloud account";
+ type leafref {
+ path "../../../rw-sdn:sdn/rw-sdn:account/rw-sdn:name";
+ }
}
}
- }
- uses rwcal:provider-auth;
- uses rwcal:connection-status;
+ uses rwcal:provider-auth;
+ uses rwcal:connection-status;
+ uses rwcal:instance-timeout;
+ }
}
}
}
}
@@
-78,6
+87,8
@@
module rw-cloud
"The cloud account name to update connection status for";
type string;
}
"The cloud account name to update connection status for";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
}
}
}