projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ping pong desc generation error
[osm/SO.git]
/
common
/
plugins
/
yang
/
rw-config-agent.yang
diff --git
a/common/plugins/yang/rw-config-agent.yang
b/common/plugins/yang/rw-config-agent.yang
index
1740af3
..
4f69b8f
100644
(file)
--- a/
common/plugins/yang/rw-config-agent.yang
+++ b/
common/plugins/yang/rw-config-agent.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.
@@
-35,6
+35,19
@@
module rw-config-agent
prefix "rwcal";
}
prefix "rwcal";
}
+ import rw-project {
+ prefix "rw-project";
+ }
+
+ import mano-types {
+ prefix "manotypes";
+ }
+
+ revision 2017-02-08 {
+ description
+ "Update model to support projects.";
+ }
+
revision 2016-02-04 {
description
"Initial revision.";
revision 2016-02-04 {
description
"Initial revision.";
@@
-48,57
+61,59
@@
module rw-config-agent
}
}
}
}
- container config-agent {
- rwpb:msg-new ConfigAgent;
+ augment "/rw-project:project" {
+ container config-agent {
+ rwpb:msg-new ConfigAgent;
- list account {
- rwpb:msg-new ConfigAgentAccount;
- key "name";
+
list account {
+
rwpb:msg-new ConfigAgentAccount;
+
key "name";
- description "List of configuration agent accounts";
+
description "List of configuration agent accounts";
- leaf name {
- description "Name of this config agent account";
- type string;
- }
+
leaf name {
+
description "Name of this config agent account";
+
type string;
+
}
- leaf account-type {
- description
+
leaf account-type {
+
description
"Default account type is Rift Configuration Agent (RiftCA)";
"Default account type is Rift Configuration Agent (RiftCA)";
- type config-agent-account-type;
- default "riftca";
- }
+
type config-agent-account-type;
+
default "riftca";
+
}
- choice config-agent-account-type {
- case juju {
- description
- "Configure the VNF through Juju.";
- container juju {
- leaf ip-address {
+
choice config-agent-account-type {
+
case juju {
+
description
+
"Configure the VNF through Juju.";
+
container juju {
+
leaf ip-address {
description "Juju host IP address.";
type inet:ip-address;
description "Juju host IP address.";
type inet:ip-address;
- }
- leaf port {
+
}
+
leaf port {
description
description
-
"Juju host port number. Default 17070.";
+ "Juju host port number. Default 17070.";
type inet:port-number;
default 17070;
type inet:port-number;
default 17070;
- }
- leaf user {
+
}
+
leaf user {
description
description
-
"User name to connect to Juju host. Default user-admin.";
+ "User name to connect to Juju host. Default user-admin.";
type string;
default "user-admin" ;
type string;
default "user-admin" ;
- }
- leaf secret {
+
}
+
leaf secret {
description
description
-
"Admin secret or password for Juju host.";
+ "Admin secret or password for Juju host.";
type string;
type string;
+ }
}
}
}
}
}
}
+ uses rwcal:connection-status;
}
}
- uses rwcal:connection-status;
}
}
}
}
@@
-111,6
+126,8
@@
module rw-config-agent
"The config agent account name to update connection status for";
type string;
}
"The config agent account name to update connection status for";
type string;
}
+
+ uses manotypes:rpc-project-name;
}
}
}
}
}
}