Migrate to stable/newton

os-odl_l2_nofeature is now deprecated since new netvirt only supports
odl_l3.

JIRA: APEX-299

Change-Id: I3557ecb85fa4cd11bba96aa9410e56a8e8cceb00
Signed-off-by: Tim Rozet <trozet@redhat.com>

15 files changed, 156 insertions, 91 deletions

diff --git a/build/Makefile b/build/Makefile
index d17b8b52..1573ea94 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -248,7 +248,7 @@ overcloud-full-clean:
 .PHONY: overcloud-full
 overcloud-full: images/overcloud-full.qcow2
 
-images/overcloud-full.qcow2: tacker-rpm tackerclient-rpm congress-rpm networking-vpp-rpm
+images/overcloud-full.qcow2: congress-rpm networking-vpp-rpm
 	@echo "Building the Apex Base Overcloud Image"
 	@./overcloud-full.sh
 
diff --git a/build/functions.sh b/build/functions.sh
index e61102ef..7ace4b0d 100644
--- a/build/functions.sh
+++ b/build/functions.sh
@@ -8,13 +8,13 @@
 ##############################################################################
 
 clone_fork () {
-    # ARG 1: opnfv-tht or opnfv-python-triplo
+    # ARG 1: opnfv-tht or opnfv-puppet-tripleo
     echo "Cloning $1"
 
     # Use apex tripleo-heat-templates fork
     local ghcreds=""
     local pr_num=""
-    local ref="stable/colorado"
+    local ref="stable/danube"
     local repo="https://github.com/trozet/$1"
 
     if git log -1 | grep "${1}-pr:" | grep -o '[0-9]*'; then
diff --git a/build/network-environment.yaml b/build/network-environment.yaml
index 8b5b070c..bd65dd9d 100644
--- a/build/network-environment.yaml
+++ b/build/network-environment.yaml
@@ -5,10 +5,10 @@
 # in a typical configuration. Override via parameter_defaults.
 resource_registry:
   OS::TripleO::Network::External: /usr/share/openstack-tripleo-heat-templates/network/external.yaml
-  OS::TripleO::Network::InternalApi: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml
-  OS::TripleO::Network::StorageMgmt: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml
-  OS::TripleO::Network::Storage: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml
-  OS::TripleO::Network::Tenant: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml
+  OS::TripleO::Network::InternalApi: OS::Heat::None
+  OS::TripleO::Network::StorageMgmt: OS::Heat::None
+  OS::TripleO::Network::Storage: OS::Heat::None
+  OS::TripleO::Network::Tenant: OS::Heat::None
   # Management network is optional and disabled by default
   #OS::TripleO::Network::Management: /usr/share/openstack-tripleo-heat-templates/network/noop.yaml
 
@@ -39,6 +39,11 @@ resource_registry:
   OS::TripleO::Compute::Net::SoftwareConfig: nics/compute.yaml
   OS::TripleO::Controller::Net::SoftwareConfig: nics/controller.yaml
 
+  # Services
+  OS::TripleO::Services::SwiftStorage: OS::Heat::None
+  OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
+  OS::TripleO::Services::SwiftProxy: OS::Heat::None
+
 parameter_defaults:
   NeutronExternalNetworkBridge: 'br-ex'
   ControlPlaneSubnetCidr: "24"
@@ -59,13 +64,11 @@ parameter_defaults:
   # StorageMgmtNetworkVlanID: 30 # NOT IMPLEMENTED
   TenantNetworkVlanID: 40
   ExternalNetworkVlanID: 50
-
-parameters:
   ServiceNetMap:
     NeutronTenantNetwork: tenant
     CeilometerApiNetwork: internal_api
     AodhApiNetwork: internal_api
-    OpenDaylightApiNetwork: internal_api
+    OpendaylightApiNetwork: internal_api
     MongoDbNetwork: internal_api
     CinderApiNetwork: internal_api
     CinderIscsiNetwork: storage
diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index e25fbc25..f45ad699 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -2,16 +2,16 @@
 #types
 
 parameters:
-  controllerImage: overcloud-full
-  OvercloudControlFlavor: control
-  OvercloudComputeFlavor: compute
-  ControllerEnableSwiftStorage: false
+#  CloudDomain:
+
+parameter_defaults:
+  CeilometerStoreEvents: true
   NeutronEnableForceMetadata: true
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
-#  CloudDomain:
-  EnableSahara: false
-  EnableTacker: true
+  OvercloudControlFlavor: control
+  OvercloudComputeFlavor: compute
+  controllerImage: overcloud-full
   ExtraConfig:
     tripleo::ringbuilder::build_ring: False
     nova::nova_public_key:
@@ -24,6 +24,103 @@ parameters:
       nova-os_compute_api:servers:show:host_status:
         key: 'os_compute_api:servers:show:host_status'
         value: 'rule:admin_or_owner'
-
-parameter_defaults:
-  CeilometerStoreEvents: true
+  ControllerServices:
+    - OS::TripleO::Services::CACerts
+#    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephMon
+    - OS::TripleO::Services::CephOSD
+    - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::CephRgw
+    - OS::TripleO::Services::CinderApi
+    - OS::TripleO::Services::CinderBackup
+    - OS::TripleO::Services::CinderScheduler
+    - OS::TripleO::Services::CinderVolume
+    - OS::TripleO::Services::Core
+    - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::Keystone
+    - OS::TripleO::Services::GlanceApi
+    - OS::TripleO::Services::GlanceRegistry
+    - OS::TripleO::Services::HeatApi
+    - OS::TripleO::Services::HeatApiCfn
+    - OS::TripleO::Services::HeatApiCloudwatch
+    - OS::TripleO::Services::HeatEngine
+    - OS::TripleO::Services::MySQL
+    - OS::TripleO::Services::NeutronDhcpAgent
+    - OS::TripleO::Services::NeutronL3Agent
+    - OS::TripleO::Services::NeutronMetadataAgent
+    - OS::TripleO::Services::NeutronApi
+    - OS::TripleO::Services::NeutronCorePlugin
+    - OS::TripleO::Services::NeutronOvsAgent
+    - OS::TripleO::Services::RabbitMQ
+    - OS::TripleO::Services::HAproxy
+    - OS::TripleO::Services::Keepalived
+    - OS::TripleO::Services::Memcached
+    - OS::TripleO::Services::Pacemaker
+    - OS::TripleO::Services::Redis
+    - OS::TripleO::Services::NovaConductor
+    - OS::TripleO::Services::MongoDb
+    - OS::TripleO::Services::NovaApi
+    - OS::TripleO::Services::NovaMetadata
+    - OS::TripleO::Services::NovaScheduler
+    - OS::TripleO::Services::NovaConsoleauth
+    - OS::TripleO::Services::NovaVncProxy
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::SwiftProxy
+    - OS::TripleO::Services::SwiftStorage
+    - OS::TripleO::Services::SwiftRingBuilder
+    - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::Timezone
+    - OS::TripleO::Services::CeilometerApi
+    - OS::TripleO::Services::CeilometerCollector
+    - OS::TripleO::Services::CeilometerExpirer
+    - OS::TripleO::Services::CeilometerAgentCentral
+    - OS::TripleO::Services::CeilometerAgentNotification
+    - OS::TripleO::Services::Horizon
+    - OS::TripleO::Services::GnocchiApi
+    - OS::TripleO::Services::GnocchiMetricd
+    - OS::TripleO::Services::GnocchiStatsd
+    - OS::Tripleo::Services::ManilaApi
+    - OS::Tripleo::Services::ManilaScheduler
+    - OS::Tripleo::Services::ManilaBackendGeneric
+    - OS::Tripleo::Services::ManilaBackendNetapp
+    - OS::Tripleo::Services::ManilaBackendCephFs
+    - OS::Tripleo::Services::ManilaShare
+    - OS::TripleO::Services::AodhApi
+    - OS::TripleO::Services::AodhEvaluator
+    - OS::TripleO::Services::AodhNotifier
+    - OS::TripleO::Services::AodhListener
+    - OS::TripleO::Services::SaharaApi
+    - OS::TripleO::Services::SaharaEngine
+    - OS::TripleO::Services::IronicApi
+    - OS::TripleO::Services::IronicConductor
+    - OS::TripleO::Services::NovaIronic
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::OpenDaylightApi
+    - OS::TripleO::Services::OpenDaylightOvs
+    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::FluentdClient
+    - OS::TripleO::Services::VipHosts
+  ComputeServices:
+    - OS::TripleO::Services::CACerts
+    - OS::TripleO::Services::CephClient
+    - OS::TripleO::Services::CephOSD
+    - OS::TripleO::Services::CephExternal
+    - OS::TripleO::Services::Timezone
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::Snmp
+    - OS::TripleO::Services::NovaCompute
+    - OS::TripleO::Services::NovaLibvirt
+    - OS::TripleO::Services::Kernel
+    - OS::TripleO::Services::ComputeNeutronCorePlugin
+    - OS::TripleO::Services::ComputeNeutronOvsAgent
+    - OS::TripleO::Services::ComputeCeilometerAgent
+    - OS::TripleO::Services::ComputeNeutronL3Agent
+    - OS::TripleO::Services::ComputeNeutronMetadataAgent
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::NeutronSriovAgent
+    - OS::TripleO::Services::OpenDaylightOvs
+    - OS::TripleO::Services::SensuClient
+    - OS::TripleO::Services::FluentdClient
+    - OS::TripleO::Services::VipHosts
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index b148542f..e35a89f1 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -18,11 +18,6 @@ if [ ! -d images/ ]; then mkdir images; fi
 tar -xf cache/overcloud-full.tar -C images/
 mv -f images/overcloud-full.qcow2 images/overcloud-full_build.qcow2
 
-# Add extra space to the overcloud image
-qemu-img resize images/overcloud-full_build.qcow2 +1G
-LIBGUESTFS_BACKEND=direct virt-customize -a images/overcloud-full_build.qcow2 \
-                                         --run-command 'resize2fs /dev/sda'
-
 ##########################################################
 #####  Prep initial overcloud image with common deps #####
 ##########################################################
@@ -139,10 +134,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /etc/puppet/modules && tar xzf puppet-fdio.tar.gz" \
     --upload vsperf.tar.gz:/var/opt \
     --run-command "cd /var/opt && tar xzf vsperf.tar.gz" \
-    --upload ../noarch/python-tackerclient-2015.2-1.trozet.noarch.rpm:/root/ \
-    --install /root/python-tackerclient-2015.2-1.trozet.noarch.rpm \
-    --upload ../noarch/openstack-tacker-2015.2-1.trozet.noarch.rpm:/root/ \
-    --install /root/openstack-tacker-2015.2-1.trozet.noarch.rpm \
     --upload puppet-tacker.tar.gz:/etc/puppet/modules/ \
     --run-command "cd /etc/puppet/modules/ && tar xzf puppet-tacker.tar.gz" \
     --run-command "pip install python-senlinclient" \
diff --git a/build/python-congressclient.diff b/build/python-congressclient.diff
deleted file mode 100644
index 82e76e07..00000000
--- a/build/python-congressclient.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-From 26d39efbb931e04a5e95d504c27ede12d0a81c43 Mon Sep 17 00:00:00 2001
-From: Masahito Muroi <muroi.masahito@lab.ntt.co.jp>
-Date: Fri, 25 Mar 2016 14:06:00 +0900
-Subject: [PATCH] Allows DataSource's config field to have not dict type obj
-
-CongressClient expects all datasource driver has dict object in
-config field. It raises an error when a datasource doesn't have
-any config.
-
-This patch allows config fields to be None object.
-
-Change-Id: I73354f1073f3f814854652eaeaa4b3bbe4bfcf7d
----
-
-diff --git a/congressclient/common/utils.py b/congressclient/common/utils.py
-index 9a381e8..b5cedd4 100644
---- a/congressclient/common/utils.py
-+++ b/congressclient/common/utils.py
-@@ -77,6 +77,8 @@
-     :param data: a dict
-     :rtype: a string formatted to {a:b, c:d}
-     """
-+    if not isinstance(data, dict):
-+        return str(data)
-     return str({str(key): str(value) for key, value in data.items()})
diff --git a/build/undercloud.sh b/build/undercloud.sh
index 3cc56009..eaa3b501 100755
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -27,12 +27,14 @@ pushd images > /dev/null
 # enabling ceph OSDs to live on the controller
 # OpenWSMan package update supports the AMT Ironic driver for the TealBox
 # seeding configuration files specific to OPNFV
-# add congress client and apply: https://review.openstack.org/#/c/297515/
-# add congress password to python-triploclient
+# add congress client
+# add congress password to python-tripleoclient
 # add tacker password to python-tripleoclient
 # upload tacker repo and install the client package
 LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../opnfv-tht.tar.gz:/usr/share \
+    --install "openstack-utils" \
+    --install "ceph-common" \
     --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \
     --run-command "sed -i '/ControllerEnableCephStorage/c\\  ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
     --run-command "sed -i '/ComputeEnableCephStorage/c\\  ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
@@ -42,8 +44,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --upload ../opnfv-environment.yaml:/home/stack/ \
     --upload ../virtual-environment.yaml:/home/stack/ \
     --install "python2-congressclient" \
-    --upload ../python-congressclient.diff:/tmp \
-    --run-command "cd /usr/lib/python2.7/site-packages && patch -p1 < /tmp/python-congressclient.diff" \
     --run-command "sed -i '/SERVICE_LIST/a\\    \x27congress\x27: {\x27password_field\x27: \x27OVERCLOUD_CONGRESS_PASSWORD\x27},' /usr/lib/python2.7/site-packages/tripleoclient/constants.py" \
     --run-command "sed -i '/PASSWORD_NAMES =/a\\    \"OVERCLOUD_CONGRESS_PASSWORD\",' /usr/lib/python2.7/site-packages/tripleoclient/utils.py" \
     --run-command "sed -i '/AodhPassword/a\\        parameters\[\x27CongressPassword\x27\] = passwords\[\x27OVERCLOUD_CONGRESS_PASSWORD\x27\]' /usr/lib/python2.7/site-packages/tripleoclient/v1/overcloud_deploy.py" \
diff --git a/build/variables.sh b/build/variables.sh
index ce9eb034..e536600b 100644
--- a/build/variables.sh
+++ b/build/variables.sh
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-rdo_images_uri=http://artifacts.opnfv.org/apex/colorado
+rdo_images_uri=http://buildlogs.centos.org/centos/7/cloud/x86_64/tripleo_images/newton/delorean
 onos_release_uri=https://downloads.onosproject.org/nightly/
 onos_release_file=onos-1.6.0-rc2.tar.gz
 onos_jdk_uri=http://artifacts.opnfv.org/apex/colorado
diff --git a/build/virtual-environment.yaml b/build/virtual-environment.yaml
index 6f1d0517..f87879cf 100644
--- a/build/virtual-environment.yaml
+++ b/build/virtual-environment.yaml
@@ -1,10 +1,5 @@
 parameter_defaults:
   controllerExtraConfig:
-  # In releases before Mitaka, HeatWorkers doesn't modify
-  # num_engine_workers, so handle via heat::config
-    heat::config::heat_config:
-      DEFAULT/num_engine_workers:
-        value: 1
     heat::api_cloudwatch::enabled: false
     heat::api_cfn::enabled: false
   HeatWorkers: 1
diff --git a/config/deploy/os-odl_l2-nofeature-ha.yaml b/config/deploy/os-odl_l2-nofeature-ha.yaml
index 4c88eeb3..dc20f6fe 100644..120000
--- a/config/deploy/os-odl_l2-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l2-nofeature-ha.yaml
@@ -1,11 +1 @@
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  odl_version: beryllium
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
+os-odl_l3-nofeature-ha.yaml
\ No newline at end of file
diff --git a/config/deploy/os-odl_l3-nofeature-ha.yaml b/config/deploy/os-odl_l3-nofeature-ha.yaml
index e54f28b0..d421c7ca 100644
--- a/config/deploy/os-odl_l3-nofeature-ha.yaml
+++ b/config/deploy/os-odl_l3-nofeature-ha.yaml
@@ -3,6 +3,7 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
+  odl_version: boron
   sdn_l3: true
   tacker: true
   congress: true
diff --git a/config/deploy/os-odl_l3-nofeature-noha.yaml b/config/deploy/os-odl_l3-nofeature-noha.yaml
new file mode 100644
index 00000000..972b1f85
--- /dev/null
+++ b/config/deploy/os-odl_l3-nofeature-noha.yaml
@@ -0,0 +1,11 @@
+global_params:
+  ha_enabled: false
+
+deploy_options:
+  sdn_controller: opendaylight
+  odl_version: boron
+  sdn_l3: true
+  tacker: true
+  congress: true
+  sfc: false
+  vpn: false
diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index 2066f15a..1a363e69 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -15,9 +15,7 @@ function overcloud_deploy {
   local num_control_nodes
 
   if [[ "${#deploy_options_array[@]}" -eq 0 || "${deploy_options_array['sdn_controller']}" == 'opendaylight' ]]; then
-    if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then
-      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_l3.yaml"
-    elif [ "${deploy_options_array['sfc']}" == 'True' ]; then
+    if [ "${deploy_options_array['sfc']}" == 'True' ]; then
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sfc.yaml"
     elif [ "${deploy_options_array['vpn']}" == 'True' ]; then
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
@@ -26,7 +24,7 @@ function overcloud_deploy {
     elif [ "${deploy_options_array['vpn']}" == 'true' ]; then
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
     else
-      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
+      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml"
     fi
     SDN_IMAGE=opendaylight
     if [ "${deploy_options_array['sfc']}" == 'True' ]; then
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index 5cb2d0cd..ae5c602c 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -22,6 +22,7 @@ from .common.constants import (
     PRE_CONFIG_DIR
 )
 
+HEAT_NONE = 'OS::Heat::None'
 PORTS = '/ports'
 # Resources defined by <resource name>: <prefix>
 EXTERNAL_RESOURCES = {'OS::TripleO::Network::External': None,
@@ -196,7 +197,7 @@ class NetworkEnvironment(dict):
             if prefix is None:
                 prefix = ''
             m = re.split('%s/\w+\.yaml' % prefix, self[reg][key])
-            if m is not None:
+            if m is not None and len(m) > 1:
                 self.tht_dir = m[0]
                 break
         if not self.tht_dir:
@@ -205,6 +206,9 @@ class NetworkEnvironment(dict):
     def _config_resource_reg(self, resources, postfix):
         for key, prefix in resources.items():
             if prefix is None:
+                if postfix == '/noop.yaml':
+                    self[reg][key] = HEAT_NONE
+                    continue
                 prefix = ''
             self[reg][key] = self.tht_dir + prefix + postfix
 
diff --git a/tests/test_apex_network_environment.py b/tests/test_apex_network_environment.py
index df0f0334..b4d7e717 100644
--- a/tests/test_apex_network_environment.py
+++ b/tests/test_apex_network_environment.py
@@ -69,7 +69,7 @@ class TestNetworkEnvironment(object):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
                                 '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(EXTERNAL_RESOURCES.keys()))]
+        regstr = ne['resource_registry']['OS::TripleO::Network::External']
         assert_equal(regstr.split('/')[-1], 'external_v6.yaml')
 
     def test_netenv_settings_external_network_removed(self):
@@ -77,8 +77,8 @@ class TestNetworkEnvironment(object):
         # Test removing EXTERNAL_NETWORK
         ns.enabled_network_list.remove(EXTERNAL_NETWORK)
         ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(EXTERNAL_RESOURCES.keys()))]
-        assert_equal(regstr.split('/')[-1], 'noop.yaml')
+        regstr = ne['resource_registry']['OS::TripleO::Network::External']
+        assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_netenv_settings_tenant_network_vlans(self):
         # test vlans
@@ -102,8 +102,8 @@ class TestNetworkEnvironment(object):
         # Test removing TENANT_NETWORK
         ns.enabled_network_list.remove(TENANT_NETWORK)
         ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(TENANT_RESOURCES.keys()))]
-        assert_equal(regstr.split('/')[-1], 'noop.yaml')
+        regstr = ne['resource_registry']['OS::TripleO::Network::Tenant']
+        assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_netenv_settings_storage_network_vlans(self):
         # test vlans
@@ -115,7 +115,7 @@ class TestNetworkEnvironment(object):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
                                 '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(STORAGE_RESOURCES.keys()))]
+        regstr = ne['resource_registry']['OS::TripleO::Network::Storage']
         assert_equal(regstr.split('/')[-1], 'storage_v6.yaml')
 
     def test_netenv_settings_storage_network_removed(self):
@@ -123,8 +123,8 @@ class TestNetworkEnvironment(object):
         # Test removing STORAGE_NETWORK
         ns.enabled_network_list.remove(STORAGE_NETWORK)
         ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(STORAGE_RESOURCES.keys()))]
-        assert_equal(regstr.split('/')[-1], 'noop.yaml')
+        regstr = ne['resource_registry']['OS::TripleO::Network::Storage']
+        assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_netenv_settings_api_network_v4(self):
         ns = copy(self.ns_vlans)
@@ -147,15 +147,15 @@ class TestNetworkEnvironment(object):
         # Test IPv6
         ne = NetworkEnvironment(self.ns_ipv6,
                                 '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(API_RESOURCES.keys()))]
+        regstr = ne['resource_registry']['OS::TripleO::Network::InternalApi']
         assert_equal(regstr.split('/')[-1], 'internal_api_v6.yaml')
 
     def test_netenv_settings_api_network_removed(self):
         ns = copy(self.ns)
         # API_NETWORK is not in the default network settings file
         ne = NetworkEnvironment(ns, '../build/network-environment.yaml')
-        regstr = ne['resource_registry'][next(iter(API_RESOURCES.keys()))]
-        assert_equal(regstr.split('/')[-1], 'noop.yaml')
+        regstr = ne['resource_registry']['OS::TripleO::Network::InternalApi']
+        assert_equal(regstr.split('/')[-1], 'OS::Heat::None')
 
     def test_numa_configs(self):
         ne = NetworkEnvironment(self.ns, '../build/network-environment.yaml',