Code Review / releng / builder.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 97d50ee 4015ebb)
Merge "To enable odl_l3 and l2gw feature work together"
authorJamo Luhrsen <jluhrsen@redhat.com>
Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 7 Apr 2017 21:27:06 +0000 (21:27 +0000)
1  2 
jjb/integration/include-raw-integration-deploy-openstack-run-test.sh patch | diff1 | diff2 | blob | history
jjb/releng-defaults.yaml patch | diff1 | diff2 | blob | history

diff --combined jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
index 3182bdcdc44dde21a414bdc957bfe1ad3e4a6813,35e23adbefc08191a3f0d046093565dce0416fe4..fd0d97e80be8f3605e40a30f6cd47c57b097a2f2
--- 1/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
--- 2/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh
@@@ -151,18 -151,28 +151,28 @@@ disable_service q-l
  PUBLIC_INTERFACE=br100
  EOF
  
- if [ -z ${DISABLE_ODL_L3_PLUGIN} ] || [ "${DISABLE_ODL_L3_PLUGIN}" == "no" ]; then
  if [ "${ODL_ML2_BRANCH}" == "stable/mitaka" ]; then
  cat >> ${local_conf_file_name} << EOF
  Q_L3_ENABLED=True
  ODL_L3=${ODL_L3}
+ 
+ EOF
+ if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
+ cat >> ${local_conf_file_name} << EOF
  [[post-config|\$NEUTRON_CONF]]
  [DEFAULT]
- service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
+ service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin, networking_l2gw.services.l2gateway.plugin.L2GatewayPlugin
  
  EOF
+ else
+ cat >> ${local_conf_file_name} << EOF
+ [[post-config|\$NEUTRON_CONF]]
+ [DEFAULT]
+ service_plugins = networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin
+ EOF
+ fi #check for ENABLE_NETWORKING_L2GW
+ 
  fi #check for ODL_ML2_BRANCH
- fi #check for DISABLE_ODL_L3_PLUGIN
  
  fi #ODL_ENABLE_L3_FWD check
  
@@@ -409,8 -419,7 +419,8 @@@ d
      scp extra_debug.sh ${!OS_CTRL_IP}:/tmp
      ${SSH} ${!OS_CTRL_IP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
      scp ${!OS_CTRL_IP}:/tmp/extra_debug.log ${OS_CTRL_FOLDER}/extra_debug.log
 -    scp ${!OS_CTRL_IP}:/opt/stack/devstack/local.conf ${OS_CTRL_FOLDER}/local.conf
 +    scp ${!OS_CTRL_IP}:/tmp/*.xz ${OS_CTRL_FOLDER}/
 +    mv local.conf_control_${!OS_CTRL_IP} ${OS_CTRL_FOLDER}/local.conf
      mv ${OS_CTRL_FOLDER} ${WORKSPACE}/archives/
  done
  
@@@ -427,7 -436,6 +437,7 @@@ d
      scp extra_debug.sh ${!OSIP}:/tmp
      ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
      scp ${!OSIP}:/tmp/extra_debug.log ${OS_COMPUTE_FOLDER}/extra_debug.log
 +    scp ${!OSIP}:/tmp/*.xz ${OS_COMPUTE_FOLDER}/
      mv local.conf_compute_${!OSIP} ${OS_COMPUTE_FOLDER}/local.conf
      mv ${OS_COMPUTE_FOLDER} ${WORKSPACE}/archives/
  done
@@@ -711,36 -719,11 +721,36 @@@ d
      fi
  
      # Control Node - PUBLIC_BRIDGE will act as the external router
 -    GATEWAY_IP="10.10.10.250" # FIXME this should be a parameter, also shared with integration-test
 -    GATEWAY_VLAN_ID=167
 -    ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} type vlan id ${GATEWAY_VLAN_ID}"
 -    ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up"
 -    ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${GATEWAY_VLAN_ID} up ${GATEWAY_IP}/24"
 +    # Parameter values below are used in integration/test - changing them requires updates in intergration/test as well
 +    EXTNET_GATEWAY_IP="10.10.10.250"
 +    EXTNET_VLAN_ID=167
 +    EXTNET_INTERNET_IP="10.9.9.9"
 +    EXTNET_PNF_IP="10.10.10.253"
 +    if [[ ${CONTROLLERFEATURES} == *"odl-ovsdb-openstack"* ]]; then
 +        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up ${EXTNET_GATEWAY_IP}/24"
 +    else
 +        ${SSH} ${!CONTROLIP} "sudo ip link add link ${PUBLIC_BRIDGE} name ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID}"
 +        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE} up"
 +        ${SSH} ${!CONTROLIP} "sudo ifconfig ${PUBLIC_BRIDGE}.${EXTNET_VLAN_ID} up ${EXTNET_GATEWAY_IP}/24"
 +
 +        # Control Node - external net PNF simulation
 +        ${SSH} ${!CONTROLIP} "
 +            sudo ip netns add pnf_ns;
 +            sudo ip link add pnf_veth0 type veth peer name pnf_veth1;
 +            sudo ip link set pnf_veth1 netns pnf_ns;
 +            sudo ip link set pnf_veth0 up;
 +            sudo ip netns exec pnf_ns ifconfig pnf_veth1 up;
 +            sudo ip netns exec pnf_ns ip link add link pnf_veth1 name pnf_veth1.${EXTNET_VLAN_ID} type vlan id ${EXTNET_VLAN_ID};
 +            sudo ip netns exec pnf_ns ifconfig pnf_veth1.${EXTNET_VLAN_ID} up ${EXTNET_PNF_IP}/24;
 +            sudo ovs-vsctl add-port br-physnet1 pnf_veth0;
 +        "
 +
 +        # Control Node - external net internet address simulation
 +        ${SSH} ${!CONTROLIP} "
 +            sudo ip tuntap add dev internet_tap mode tap;
 +            sudo ifconfig internet_tap up ${EXTNET_INTERNET_IP}/24;
 +        "
 +    fi
  
      # Computes
      compute_index=1
diff --combined jjb/releng-defaults.yaml
index 8888aa50f6b4f27d146a867ee275cb7eb9e0ba57,f69f5eac1a08cc44e23910a7cccb1e5fc1e4259a..456f8b959f690a2304b45c4c196502b1c4f913a2
--- 1/jjb/releng-defaults.yaml
--- 2/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@@ -23,7 -23,6 +23,6 @@@
      public-bridge: 'br-physnet1'
      public-physical-network: 'physnet1'
      odl-enable-l3: 'yes'
-     disable-odl-l3-service-plugin: 'no'
      odl-ml2-driver-version: 'v1'
      odl-ml2-port-binding: 'network-topology'
      enable-openstack-plugins: 'networking-odl'
@@@ -51,7 -50,7 +50,7 @@@
      docker_system_image: CentOS 7 - docker - 20170120-1434
      odl_system_count: 1
      odl_system_flavor: 4 GB General Purpose v1
 -    odl_system_image: CentOS 7 - java-builder - 20170126-0058
 +    odl_system_image: CentOS 7 - java-builder - 20170311-0517
      openstack_system_count: 1
      openstack_system_flavor: 8 GB General Purpose v1
      openstack_system_image: CentOS 7 - devstack - 20170221-1719
@@@ -140,28 -139,11 +139,28 @@@
      10-inclusion-flag: 'off'
      10-exclude-value: ''
  
 +    # Manual CSIT job lists used by sanity
 +    # and weekly distribution test jobs
 +    csit-sanity-list-carbon: >
 +        openflowplugin-csit-1node-sanity-only-carbon
 +    csit-sanity-list-boron: >
 +        openflowplugin-csit-1node-sanity-only-boron
 +    csit-weekly-list-carbon: >
 +        controller-csit-1node-notifications-longevity-only-carbon,
 +        controller-csit-3node-drb-partnheal-longevity-only-carbon,
 +        controller-csit-3node-drb-precedence-longevity-only-carbon,
 +        openflowplugin-csit-1node-periodic-longevity-only-carbon
 +    csit-weekly-list-boron: >
 +        openflowplugin-csit-1node-periodic-longevity-only-boron
 +
      # CSIT Test List Variables
 -    # Space seperated strings to exclude from CSIT lists
 +    # Space seperated strings to exclude from
 +    # auto generated CSIT job lists
      csit-list-blacklist: 'longevity gate sanity'
 +
      # Auto Generated CSIT job lists used
 -    # in integration-distribution-test jobs
 +    # in regular distribution test jobs
 +    # DO NOT EDIT NEXT LINES MANUALLY
      csit-list-carbon: >
          aaa-csit-1node-authn-all-carbon,
          aaa-csit-1node-authn-only-carbon,
@@@ -261,10 -243,6 +260,10 @@@
          netvirt-csit-1node-openstack-newton-upstream-learn-carbon,
          netvirt-csit-1node-openstack-newton-upstream-stateful-carbon,
          netvirt-csit-1node-openstack-newton-upstream-transparent-carbon,
 +        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-carbon,
 +        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-carbon,
 +        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-carbon,
 +        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-carbon,
          netvirt-csit-3node-openstack-mitaka-upstream-learn-carbon,
          netvirt-csit-3node-openstack-mitaka-upstream-stateful-carbon,
          netvirt-csit-3node-openstack-mitaka-upstream-transparent-carbon,
@@@ -292,6 -270,15 +291,6 @@@
          netvirt-csit-hwvtep-3node-openstack-newton-upstream-learn-carbon,
          netvirt-csit-hwvtep-3node-openstack-newton-upstream-stateful-carbon,
          netvirt-csit-hwvtep-3node-openstack-newton-upstream-transparent-carbon,
 -        netvirt-legacy-csit-1node-openstack-basic-all-carbon,
 -        netvirt-legacy-csit-1node-openstack-basic-only-carbon,
 -        netvirt-legacy-csit-1node-openstack-mitaka-upstream-carbon,
 -        netvirt-legacy-csit-1node-openstack-newton-nodl-v2-upstream-carbon,
 -        netvirt-legacy-csit-1node-openstack-newton-upstream-carbon,
 -        netvirt-legacy-csit-3node-clustering-only-carbon,
 -        netvirt-legacy-csit-3node-openstack-mitaka-upstream-carbon,
 -        netvirt-legacy-csit-3node-openstack-newton-nodl-v2-upstream-carbon,
 -        netvirt-legacy-csit-3node-openstack-newton-upstream-carbon,
          nic-csit-1node-basic-all-carbon,
          nic-csit-1node-basic-only-carbon,
          nic-csit-1node-vtnrenderer-all-carbon,
@@@ -312,6 -299,7 +311,6 @@@
          openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-carbon,
          openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-carbon,
          openflowplugin-csit-1node-periodic-sw-scalability-daily-only-carbon,
 -        openflowplugin-csit-1node-sanity-only-carbon,
          openflowplugin-csit-1node-scalability-only-carbon,
          openflowplugin-csit-3node-clustering-only-carbon,
          openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-carbon,
@@@ -367,6 -355,11 +366,6 @@@
          vtn-csit-3node-manager-all-carbon,
          vtn-csit-3node-manager-only-carbon,
          yangtools-csit-1node-periodic-system-only-carbon
 -    csit-sanity-list-carbon: >
 -        openflowplugin-csit-1node-sanity-only-carbon
 -    csit-weekly-list-carbon: >
 -        controller-csit-1node-notifications-longevity-only-carbon,
 -        openflowplugin-csit-1node-periodic-longevity-only-carbon
      csit-list-boron: >
          aaa-csit-1node-authn-all-boron,
          aaa-csit-1node-authn-only-boron,
@@@ -457,10 -450,6 +456,10 @@@
          netvirt-csit-1node-openstack-newton-upstream-learn-boron,
          netvirt-csit-1node-openstack-newton-upstream-stateful-boron,
          netvirt-csit-1node-openstack-newton-upstream-transparent-boron,
 +        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-learn-boron,
 +        netvirt-csit-2site-1node-openstack-newton-nodl-v2-upstream-stateful-boron,
 +        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-learn-boron,
 +        netvirt-csit-2site-3node-openstack-newton-nodl-v2-upstream-stateful-boron,
          netvirt-csit-3node-openstack-mitaka-upstream-learn-boron,
          netvirt-csit-3node-openstack-mitaka-upstream-stateful-boron,
          netvirt-csit-3node-openstack-mitaka-upstream-transparent-boron,
@@@ -517,6 -506,7 +516,6 @@@
          openflowplugin-csit-1node-periodic-scale-stats-collection-daily-frs-only-boron,
          openflowplugin-csit-1node-periodic-scale-stats-collection-daily-only-boron,
          openflowplugin-csit-1node-periodic-sw-scalability-daily-only-boron,
 -        openflowplugin-csit-1node-sanity-only-boron,
          openflowplugin-csit-1node-scalability-only-boron,
          openflowplugin-csit-3node-clustering-only-boron,
          openflowplugin-csit-3node-periodic-bulkomatic-clustering-daily-only-boron,
@@@ -566,6 -556,10 +565,6 @@@
          vtn-csit-1node-openstack-newton-neutron-boron,
          vtn-csit-3node-manager-all-boron,
          vtn-csit-3node-manager-only-boron
 -    csit-sanity-list-boron: >
 -        openflowplugin-csit-1node-sanity-only-boron
 -    csit-weekly-list-boron: >
 -        openflowplugin-csit-1node-periodic-longevity-only-boron
      csit-list-beryllium: >
          aaa-csit-1node-authn-all-beryllium,
          aaa-csit-1node-authn-only-beryllium,
Release Engineering Build infrastructure (Jenkins Job Builder, Packer, etc)