X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=models%2Fplugins%2Fyang%2Fmano-types.yang;h=c6b40034b5b6d70b89140d3bff578d095558d122;hb=65c780c68fed897c97967a9158b702b42fc62698;hp=4ec602cb7de466e67fb9d9781f684574143fb1b2;hpb=8cc7ca95395fd8e7ff7297ab020ac9dbaa6e6c6e;p=osm%2FSO.git

diff --git a/models/plugins/yang/mano-types.yang b/models/plugins/yang/mano-types.yang
index 4ec602cb..c6b40034 100644
--- a/models/plugins/yang/mano-types.yang
+++ b/models/plugins/yang/mano-types.yang
@@ -212,61 +212,18 @@ module mano-types
       choice config-method {
         description
             "Defines the configuration method for the VNF.";
-        case netconf {
-          description
-              "Use NETCONF for configuring the VNF.";
-          container netconf {
-            leaf target {
-              description
-                  "Netconf configuration target";
-              type enumeration {
-                enum running;
-                enum candidate;
-              }
-            }
-
-            leaf protocol {
-              description
-                  "Protocol to use for NETCONF, such as ssh";
-              type enumeration {
-                enum None;
-                enum ssh;
-              }
-            }
-
-            leaf port {
-              description
-                  "Port for the NETCONF server.";
-              type inet:port-number;
-            }
-          }
-        }
-
-        case rest {
-          description
-              "Use REST for configuring the VNF.";
-          container rest {
-            leaf port {
-              description
-                  "Port for the REST server.";
-              type inet:port-number;
-            }
-          }
-        }
-
         case script {
           description
               "Use custom script for configuring the VNF.
-               This script is executed in the context of 
+               This script is executed in the context of
                Orchestrator (The same system and environment
                as the Launchpad).";
           container script {
             leaf script-type {
               description
-                  "Script type - currently supported : bash, expect";
+                  "Script type - currently supported : python";
               type enumeration {
-                enum bash;
-                enum expect;
+                enum python;
               }
             }
           }
@@ -284,27 +241,6 @@ module mano-types
         }
       }
 
-      container config-access {
-        leaf mgmt-ip-address {
-          description
-              "IP address to be used to configure this VNF,
-               optional if it is possible to resolve dynamically.";
-          type inet:ip-address;
-        }
-
-        leaf username {
-          description 
-              "User name for configuration.";
-          type string;
-        }
-
-        leaf password {
-          description 
-              "Password for configuration access authentication.";
-          type string;
-        }
-      }
-
       container config-attributes {
         description
             "Miscellaneous input parameters to be considered
@@ -353,12 +289,6 @@ module mano-types
         key "seq";
         uses initial-config;
       }
-
-      leaf config-template {
-        description
-            "Configuration template for each VNF";
-        type string;
-      }
     }
   } // END - grouping vnf-configuration