Merge pull request #11 from omaralghussein/master

fix juniper CLI mode

README.rst

@@ -59,12 +59,12 @@ Example of interacting with Cisco IOS devices:
  dev1 = { 'username' : 'user',
  'password' : 'pass',
  'device_type': 'cisco_ios',
- 'host': 'ip address',
+ 'ip': 'ip address',
  }
  dev2 = { 'username' : 'user',
  'password' : 'pass',
  'device_type': 'cisco_ios',
- 'host': 'ip address',
+ 'ip': 'ip address',
  }
  devices = [dev1, dev2]
  tasks = [task(dev) for dev in devices]

aionet/vendors/devices/base_junos.py

@@ -72,15 +72,17 @@ async def _set_base_prompt(self):
  # Strip off trailing terminator
  if "@" in prompt:
  prompt = prompt.split("@")[1]
- self._base_prompt = prompt
+ self.device_prompt = prompt
  delimiters = map(re.escape, type(self)._delimiter_list)
  delimiters = r"|".join(delimiters)
- base_prompt = re.escape(self._base_prompt[:12])
+ base_prompt = re.escape(self.device_prompt[:12])
  pattern = type(self)._pattern
- self._base_pattern = pattern.format(delimiters=delimiters)
- self._logger.debug("Base Prompt: %s" % self._base_prompt)
- self._logger.debug("Base Pattern: %s" % self._base_pattern)
- return self._base_prompt
+ base_pattern = pattern.format(delimiters=delimiters)
+ self._logger.debug("Base Prompt: %s" % self.device_prompt)
+ self._logger.debug("Base Pattern: %s" % base_pattern)
+ self.prompt_pattern = base_pattern
+ self._conn.set_base_pattern(base_pattern)
+ return self.device_prompt
 
  async def send_config_set(
  self,

aionet/vendors/devices/juniper/juniper_junos.py

@@ -1,4 +1,4 @@
-from aionet.vendors.terminal_modes.juniper import CliMode
+from aionet.vendors.terminal_modes.juniper import CliMode,ConfigMode
 from aionet.vendors.devices.base_junos import BAseJunOSDevice
 
 
@@ -15,12 +15,28 @@ def __init__(self, *args, **kwargs):
  device=self
  )
 
+ self.config_mode = ConfigMode(
+ enter_command=type(self)._config_command,
+ check_string=type(self)._config_check,
+ exit_command='exit',
+ device=self,
+ parent=self.cli_mode
+
+ )
+
  _cli_check = ">"
  """Checking string for shell mode"""
 
  _cli_command = "cli"
  """Command for entering to cli mode"""
 
+ _config_check = "#"
+ """Checking string for shell mode"""
+
+ _config_command = "configure"
+ """Command for entering to cli mode"""
+
  async def _session_preparation(self):
- await self.cli_mode()
  await super()._session_preparation()
+ await self.cli_mode()
+

aionet/vendors/terminal_modes/juniper.py

@@ -6,6 +6,15 @@
 
 
 class ConfigMode(CiscoConfigMode):
+ async def check(self, force=False):
+ """Check if are in configuration mode. Return boolean"""
+ if self.device.current_terminal is not None and not force:
+ if self.device.current_terminal == self:
+ return True
+ await self.device.send_new_line()
+ output = await self.device.send_new_line()
+
+ return self._check_string in output
  pass