Refactor heat template for ONAP OOM

Change-Id: I6883aaf59510a9b8d426523ea1c3a15504a120c5
Issue-ID: INT-381
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

1 files changed, 83 insertions, 2 deletions

diff --git a/test/ete/labs/huawei/onap-oom.yaml b/test/ete/labs/huawei/onap-oom.yaml
index ff4d83550..049e3732b 100644
--- a/test/ete/labs/huawei/onap-oom.yaml
+++ b/test/ete/labs/huawei/onap-oom.yaml
@@ -2,17 +2,88 @@ heat_template_version: 2015-10-15
 description: ONAP on Kubernetes using OOM
 
 parameters:
+  docker_proxy:
+    type: string
+
+  apt_proxy:
+    type: string
+
   public_net_id:
     type: string
     description: The ID of the Public network for floating IP address allocation
 
-  docker_proxy:
+  dns_list:
+    type: comma_delimited_list
+    description: List of External DNS for OAM ONAP network
+
+  oam_network_cidr:
     type: string
+    description: CIDR of the OAM ONAP network
 
-  apt_proxy:
+  keystone_url:
+    type: string
+    description: URL of OpenStack Keystone
+
+  openstack_tenant_id:
+    type: string
+    description: OpenStack tenant ID
+
+  openstack_tenant_name:
+    type: string
+    description: OpenStack tenant name (matching with the openstack_tenant_id)
+
+  openstack_username:
+    type: string
+    description: OpenStack username
+
+  openstack_api_key:
     type: string
+    description: OpenStack password or API Key
+
+  ubuntu_1404_image:
+    type: string
+    description: Name of the Ubuntu 14.04 image
 
 resources:
+  random-str:
+    type: OS::Heat::RandomString
+    properties:
+      length: 4
+
+  # ONAP management private network
+  oam_network:
+    type: OS::Neutron::Net
+    properties:
+      name:
+        str_replace:
+          template: "oam_network_RAND"
+          params:
+            RAND: { get_resource: random-str }
+
+  oam_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name:
+        str_replace:
+          template: "oam_subnet_RAND"
+          params:
+            RAND: { get_resource: random-str }
+      network_id: { get_resource: oam_network }
+      cidr: { get_param: oam_network_cidr }
+      dns_nameservers: { get_param: dns_list }
+
+  router:
+    type: OS::Neutron::Router
+    properties:
+      external_gateway_info:
+        network: { get_param: public_net_id }
+
+  router_interface:
+    type: OS::Neutron::RouterInterface
+    properties:
+      router_id: { get_resource: router }
+      subnet_id: { get_resource: oam_subnet }
+
   rancher_vm:
     type: OS::Nova::Server
     properties:
@@ -47,5 +118,15 @@ resources:
             __docker_proxy__: { get_param: docker_proxy }
             __apt_proxy__: { get_param: apt_proxy }
             __rancher_ip_addr__: { get_attr: [rancher_vm, first_address] }
+            __openstack_tenant_id__: { get_param: openstack_tenant_id }
+            __openstack_tenant_name__: { get_param: openstack_tenant_name }
+            __openstack_username__: { get_param: openstack_username }
+            __openstack_api_key__: { get_param : openstack_api_key }
+            __public_net_id__: { get_param: public_net_id }
+            __oam_network_id__: { get_resource: oam_network }
+            __oam_subnet_id__: { get_resource: oam_subnet }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
+            __keystone_url__: { get_param: keystone_url }
           template:
             get_file: k8s_vm_entrypoint.sh