XML bug fix

Missing closing tag making the XML invalid

Author: Stephane Robert

constraints.txt

@@ -4,22 +4,23 @@
 #
 #    pip-compile --no-index --no-emit-trusted-host --output-file constraints.txt requirements.txt
 #
-certifi==2018.1.18        # via requests
+certifi==2018.8.24        # via requests
 chardet==3.0.4            # via requests
 click==6.7                # via flask
 ecdsa==0.13               # via paramiko
-flask==0.12.2
-idna==2.6                 # via requests
+flask==1.0.2
+idna==2.7                 # via requests
 itsdangerous==0.24        # via flask
 jinja2==2.10              # via flask
-lxml==4.2.1               # via ncclient
+lxml==4.2.4               # via ncclient
 markupsafe==1.0           # via jinja2
-ncclient==0.5.3
+ncclient==0.6.2
 netaddr==0.7.19
 paramiko==1.17.6
-pbr==3.1.1
+pbr==4.2.0
 pycrypto==2.6.1           # via paramiko
-requests==2.18.4
+requests==2.19.1
+selectors2==2.0.1         # via ncclient
 six==1.11.0               # via ncclient
-urllib3==1.22             # via requests
+urllib3==1.23             # via requests
 werkzeug==0.14.1          # via flask

netman/adapters/switches/juniper/base.py

@@ -319,9 +319,9 @@ def set_interface_auto_negotiation_state(self, interface_id, negotiation_state):
             </interface>
             """.format(interface_id))
         if negotiation_state == ON:
-            content.append(to_ele("<ether-options><auto-negotiation></ether-options>"))
+            content.append(to_ele("<ether-options><auto-negotiation/></ether-options>"))
         else:
-            content.append(to_ele("<ether-options><no-auto-negotiation></ether-options>"))
+            content.append(to_ele("<ether-options><no-auto-negotiation/></ether-options>"))
         update = Update()
         update.add_interface(content)
 

test-constraints.txt

@@ -4,63 +4,65 @@
 #
 #    pip-compile --no-index --no-emit-trusted-host --output-file test-constraints.txt test-requirements.txt constraints.txt rtd-requirements.txt
 #
-alabaster==0.7.10         # via sphinx
+alabaster==0.7.11         # via sphinx
 appdirs==1.4.3            # via rply, twisted
 args==0.1.0               # via clint
 asn1crypto==0.24.0        # via cryptography
-astor==0.6.2              # via hy
-babel==2.5.3              # via sphinx
-certifi==2018.1.18
+astor==0.7.1              # via hy
+babel==2.6.0              # via sphinx
+certifi==2018.8.24
 cffi==1.11.5              # via cryptography
 chardet==3.0.4
 click==6.7
 clint==0.5.1              # via hy
 configparser==3.5.0       # via flake8
 constantly==15.1.0        # via twisted
-cryptography==2.2.1       # via twisted
+cryptography==2.3.1       # via twisted
 docutils==0.14            # via sphinx
 ecdsa==0.13
 enum34==1.1.6             # via cryptography, flake8
-fake-switches==1.2.4
+fake-switches==1.2.5
 flake8==3.4.1
-flask==0.12.2
+flask==1.0.2
 flexmock==0.10.2
+funcparserlib==0.3.6      # via hy
 funcsigs==1.0.2           # via mock
 futures==3.2.0
-gunicorn==19.7.1
-hy==0.14.0                # via mockssh
-idna==2.6
-imagesize==1.0.0          # via sphinx
+gunicorn==19.9.0
+hy==0.15.0                # via mockssh
+idna==2.7
+imagesize==1.1.0          # via sphinx
 incremental==17.5.0       # via twisted
-ipaddress==1.0.19         # via cryptography
+ipaddress==1.0.22         # via cryptography
 itsdangerous==0.24
 jinja2==2.10
-lxml==4.2.1
+lxml==4.2.4
 markupsafe==1.0
 mccabe==0.6.1             # via flake8
 mock==2.0.0
 mockssh==1.4.3
-ncclient==0.5.3
+ncclient==0.6.2
 netaddr==0.7.19
 nose==1.3.7
 paramiko==1.17.6
-pbr==3.1.1
-pyasn1==0.4.2             # via mockssh, twisted
+pbr==4.2.0
+pyasn1==0.4.4             # via mockssh, twisted
 pycodestyle==2.3.1        # via flake8
 pycparser==2.18           # via cffi
 pycrypto==2.6.1
 pyflakes==1.5.0           # via flake8
 pygments==2.2.0           # via sphinx
 pyhamcrest==1.9.0
-pytz==2018.3              # via babel
-requests==2.18.4
-rply==0.7.5               # via hy
+pytz==2018.5              # via babel
+requests==2.19.1
+rply==0.7.6               # via hy
+selectors2==2.0.1
 six==1.11.0
 snowballstemmer==1.2.1    # via sphinx
 sphinx==1.5.6
-sphinxcontrib-httpdomain==1.6.1
-tftpy==0.6.2              # via fake-switches
+sphinxcontrib-httpdomain==1.7.0
+tftpy==0.7.0              # via fake-switches
 twisted[conch]==16.6.0    # via fake-switches, mockssh
-urllib3==1.22
+urllib3==1.23
 werkzeug==0.14.1
-zope.interface==4.4.3     # via twisted
+zope.interface==4.5.0     # via twisted

tests/adapters/switches/juniper_qfx_copper_test.py

@@ -644,7 +644,7 @@ def test_change_bond_speed_update_slaves_and_interface_at_same_time(self):
                     <name>ae10</name>
                     <aggregated-ether-options>
                       <link-speed>1g</link-speed>
-                    </ether-options>
+                    </aggregated-ether-options>
                   </interface>
                 </interfaces>
               </configuration>

tests/adapters/switches/juniper_test.py

@@ -2322,7 +2322,7 @@ def test_port_mode_trunk_with_no_port_mode_and_1_vlan_removes_it(self):
                       <family>
                         <ethernet-switching>
                           <port-mode>trunk</port-mode>
-                          <vlan operation="delete">
+                          <vlan operation="delete" />
                         </ethernet-switching>
                       </family>
                     </unit>
@@ -2377,7 +2377,7 @@ def test_port_mode_trunk_with_access_port_mode_and_1_vlan_removes_it(self):
                       <family>
                         <ethernet-switching>
                           <port-mode>trunk</port-mode>
-                          <vlan operation="delete">
+                          <vlan operation="delete" />
                         </ethernet-switching>
                       </family>
                     </unit>
@@ -3693,7 +3693,7 @@ def test_unset_interface_auto_negotiation_state_works_when_enabled(self):
                       <interface>
                         <name>ge-0/0/6</name>
                         <ether-options>
-                          <auto-negotiation operation=\"delete\"/>
+                          <auto-negotiation operation=\"delete\" />
                         </ether-options>
                       </interface>
                     </interfaces>
@@ -3767,7 +3767,7 @@ def test_unset_interface_auto_negotiation_state_works_when_disabled(self):
                       <interface>
                         <name>ge-0/0/6</name>
                         <ether-options>
-                          <no-auto-negotiation operation=\"delete\"/>
+                          <no-auto-negotiation operation=\"delete\" />
                         </ether-options>
                       </interface>
                     </interfaces>
@@ -4453,7 +4453,7 @@ def test_set_interface_description_succeeds(self):
                 <interfaces>
                   <interface>
                     <name>ge-0/0/6</name>
-                    <description>Resistance is futile</name>
+                    <description>Resistance is futile</description>
                   </interface>
                 </interfaces>
               </configuration>
@@ -4469,7 +4469,7 @@ def test_set_interface_description_on_unkown_interface_raises(self):
                 <interfaces>
                   <interface>
                     <name>ge-0/0/99</name>
-                    <description>Resistance is futile</name>
+                    <description>Resistance is futile</description>
                   </interface>
                 </interfaces>
               </configuration>
@@ -5783,7 +5783,7 @@ def test_change_bond_speed_update_slaves_and_interface_at_same_time(self):
                     <name>ae10</name>
                     <aggregated-ether-options>
                       <link-speed>1g</link-speed>
-                    </ether-options>
+                    </aggregated-ether-options>
                   </interface>
                   <interface>
                     <name>ge-0/0/1</name>
@@ -6197,7 +6197,7 @@ def test_set_interface_lldp_state_when_disabled(self):
                   <lldp>
                     <interface>
                       <name>ge-0/0/6</name>
-                      <disable operation="delete"/>
+                      <disable operation="delete" />
                     </interface>
                   </lldp>
                 </protocols>

tox.ini

@@ -23,7 +23,7 @@ commands = python setup.py build_sphinx --fresh-env
 skipsdist = True
 skip_install = true
 install_command = pip install {opts} {packages}
-deps = pip-tools==1.11.0
+deps = pip-tools==2.0.2
 commands =
     pip-compile --upgrade --no-index --no-emit-trusted-host --output-file constraints.txt requirements.txt
     pip-compile --upgrade --no-index --no-emit-trusted-host --output-file test-constraints.txt test-requirements.txt constraints.txt rtd-requirements.txt