Update port 8080 remap for Lithium

[integration/packaging/puppet-opendaylight.git] / spec / spec_helper.rb

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 1b2cd117b33d47c2b3b2d5222eaf23b8c51fa3bb..5539315a7f19a8e0778506ff5bd0222e5f4ca792 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -111,18 +111,18 @@ def odl_rest_port_tests(options = {})
   # Extract params
   # NB: This default value should be the same as one in opendaylight::params
   # TODO: Remove this possible source of bugs^^
-  odl_rest_port = options.fetch(:odl_rest_port, 8282)
+  odl_rest_port = options.fetch(:odl_rest_port, 8080)
 
   # Confirm properties of ODL REST port config file
   # NB: These hashes don't work with Ruby 1.8.7, but we
   #   don't support 1.8.7 so that's okay. See issue #36.
   it {
-    should contain_file('tomcat-server.xml').with(
+    should contain_file('jetty.xml').with(
       'ensure'      => 'file',
-      'path'        => '/opt/opendaylight/configuration/tomcat-server.xml',
+      'path'        => '/opt/opendaylight/etc/jetty.xml',
       'owner'   => 'odl',
       'group'   => 'odl',
-      'content'     => /Connector port="#{odl_rest_port}"/
+      'content'     => /Property name="jetty.port" default="#{odl_rest_port}"/
     )
   }
 end