Restore the deprecated credentials name.

[netconf.git] / netconf / netconf-console / src / test / resources / schemas / netconf-node-topology.yang

diff --git a/netconf/netconf-console/src/test/resources/schemas/netconf-node-topology.yang b/netconf/netconf-console/src/test/resources/schemas/netconf-node-topology.yang
index ffddaa2463cb718f608c55d23c4872ef0f258635..3da84be98b845219b9a32b9aa31e868d21f05dde 100644 (file)
--- a/netconf/netconf-console/src/test/resources/schemas/netconf-node-topology.yang
+++ b/netconf/netconf-console/src/test/resources/schemas/netconf-node-topology.yang
@@ -28,7 +28,7 @@ module netconf-node-topology {
     grouping netconf-node-credentials {
         choice credentials {
             config true;
-            case login-password-deprecated {
+            case login-password {
                 description "Deprecated way of storing credentials, unencrypted.";
 
                 status deprecated;
@@ -37,7 +37,6 @@ module netconf-node-topology {
             case login-pw {
                 description "login-password credentials, encrypted.";
 
-
                 container login-password {
                     uses username-password;
                 }
@@ -49,11 +48,17 @@ module netconf-node-topology {
                     uses username-password;
                 }
             }
-            case key-based {
-                description "key-pair based authentication, use the id for the pair thats stored in the keystore.";
+            case key-auth {
+                description "key-based authentication, use the id for the pair thats stored in the keystore.";
 
-                leaf pair-id {
-                    type string;
+                container key-based {
+                    leaf key-id {
+                        type string;
+                    }
+
+                    leaf username {
+                        type string;
+                    }
                 }
             }
         }
@@ -300,7 +305,7 @@ module netconf-node-topology {
 
     }
 
-    rpc add-netconf-node {
+    rpc create-device {
         input {
             uses netconf-node-fields;
             leaf node-id {
@@ -309,6 +314,14 @@ module netconf-node-topology {
         }
     }
 
+    rpc delete-device {
+        input {
+            leaf node-id {
+                type string;
+            }
+        }
+    }
+
     augment "/nt:network-topology/nt:topology/nt:node" {
         when "../../nt:topology-types/topology-netconf";
         ext:augment-identifier "netconf-node";