Merge pull request Juniper#429 from dineshbaburam91/open_config_junos_config

Openconfig and yang supports in  juniper_junos_config module

Author: rsmekala

library/juniper_junos_config.py

@@ -748,6 +748,7 @@ def main():
         juniper_junos_common.CONFIG_DATABASE_CHOICES
     config_action_choices = [None] + juniper_junos_common.CONFIG_ACTION_CHOICES
     config_mode_choices = juniper_junos_common.CONFIG_MODE_CHOICES
+    config_model_choices = juniper_junos_common.CONFIG_MODEL_CHOICES
 
     # Create the module instance.
     junos_module = juniper_junos_common.JuniperJunosModule(
@@ -790,6 +791,16 @@ def main():
                         type='str',
                         required=False,
                         default=None),
+            model=dict(required=False,
+                       choices=config_model_choices,
+                        type='str',
+                        default=None),
+            remove_ns=dict(required=False,
+                            type='bool',
+                            default=None),
+            namespace=dict(required=False,
+                            type='str',
+                            default=None),
             check=dict(required=False,
                        type='bool',
                        aliases=['check_commit', 'commit_check'],
@@ -885,6 +896,10 @@ def main():
     confirmed = junos_module.params.get('confirmed')
     comment = junos_module.params.get('comment')
     check_commit_wait = junos_module.params.get('check_commit_wait')
+    model = junos_module.params.get('model')
+    remove_ns = junos_module.params.get('remove_ns')
+    namespace = junos_module.params.get('namespace')
+
 
     # If retrieve is set and load and rollback are not set, then
     # check, diff, and commit default to False.
@@ -1076,7 +1091,10 @@ def main():
                                       database=retrieve,
                                       format=format,
                                       options=options,
-                                      filter=filter)
+                                      filter=filter,
+                                      model=model,
+                                      namespace=namespace,
+                                      remove_ns=remove_ns)
         if return_output is True:
             if config is not None:
                 results['config'] = config

module_utils/juniper_junos_common.py

@@ -419,6 +419,7 @@ class ModuleDocFragment(object):
           - INFO
           - DEBUG
                
+
 '''
 
     # _SUB_CONNECT_DOCUMENTATION is just _CONNECT_DOCUMENTATION with each
@@ -582,6 +583,8 @@ class ModuleDocFragment(object):
                          'replace', 'override', 'overwrite']
 # Supported configuration modes
 CONFIG_MODE_CHOICES = ['exclusive', 'private']
+# Supported configuration models
+CONFIG_MODEL_CHOICES = ['openconfig', 'custom', 'ietf', 'True']
 
 
 def convert_to_bool_func(arg):
@@ -1409,7 +1412,8 @@ def close_configuration(self):
                                    (str(ex)))
 
     def get_configuration(self, database='committed', format='text',
-                          options={}, filter=None):
+                          options={}, filter=None, model=None,
+                          namespace=None, remove_ns=True):
         """Return the device configuration in the specified format.
 
         Return the database device configuration database in the format format.
@@ -1457,7 +1461,10 @@ def get_configuration(self, database='committed', format='text',
         config = None
         try:
             config = self.dev.rpc.get_config(options=options,
-                                             filter_xml=filter)
+                                             filter_xml=filter,
+                                             model=model,
+                                             remove_ns=remove_ns,
+                                             namespace=namespace)
             self.logger.debug("Configuration retrieved.")
         except (self.pyez_exception.RpcError,
                 self.pyez_exception.ConnectError) as ex:
@@ -1469,7 +1476,7 @@ def get_configuration(self, database='committed', format='text',
             if not isinstance(config, self.etree._Element):
                 self.fail_json(msg='Unexpected configuration type returned. '
                                    'Configuration is: %s' % (str(config)))
-            if config.tag != 'configuration-text':
+            if model is None and config.tag != 'configuration-text':
                 self.fail_json(msg='Unexpected XML tag returned. '
                                    'Configuration is: %s' %
                                    (etree.tostring(config, pretty_print=True)))
@@ -1478,7 +1485,7 @@ def get_configuration(self, database='committed', format='text',
             if not isinstance(config, self.etree._Element):
                 self.fail_json(msg='Unexpected configuration type returned. '
                                    'Configuration is: %s' % (str(config)))
-            if config.tag != 'configuration-set':
+            if model is None and config.tag != 'configuration-set':
                 self.fail_json(msg='Unexpected XML tag returned. '
                                    'Configuration is: %s' %
                                    (etree.tostring(config, pretty_print=True)))
@@ -1487,7 +1494,7 @@ def get_configuration(self, database='committed', format='text',
             if not isinstance(config, self.etree._Element):
                 self.fail_json(msg='Unexpected configuration type returned. '
                                    'Configuration is: %s' % (str(config)))
-            if config.tag != 'configuration':
+            if model is None and config.tag != 'configuration':
                 self.fail_json(msg='Unexpected XML tag returned. '
                                    'Configuration is: %s' %
                                    (etree.tostring(config, pretty_print=True)))