Rename Huawei Jenkins slaves

Slave names will be as below.

- huawei-us-deploy-bare-1 -> huawei-pod1
- huawei-us-deploy-bare-2 -> huawei-pod2
- huawei-sh-test-2-defaults -> huawei-pod3
- huawei-sh-pod6 -> huawei-pod4
- huawei-us-deploy-vm-1 -> huawei-virtual1
- huawei-us-deploy-vm-2 -> huawei-virtual2
- huawei-us-deploy-vm-3 -> huawei-virtual3
- huawei-us-deploy-vm-4 -> huawei-virtual4

Change-Id: I3a8727b0db53739b02a805cf40ddc3ba7f50ef52
Signed-off-by: meimei <meimei@huawei.com>

2 files changed, 0 insertions, 180 deletions

diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network.yml b/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network.yml
deleted file mode 100644
index b11cba01..00000000
--- a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-nic_mappings: []
-bond_mappings: []
-
-provider_net_mappings:
-  - name: br-prv
-    network: physnet
-    interface: eth1
-    type: ovs
-    role:
-      - controller
-      - compute
-
-sys_intf_mappings:
-  - name: mgmt
-    interface: eth1
-    vlan_tag: 101
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    interface: eth1
-    vlan_tag: 102
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: external
-    interface: br-prv
-    type: ovs
-    role:
-      - controller
-      - compute
-
-ip_settings:
-  - name: mgmt
-    ip_ranges:
-    - - "172.16.1.1"
-      - "172.16.1.254"
-    cidr: "172.16.1.0/24"
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    ip_ranges:
-    - - "172.16.2.1"
-      - "172.16.2.254"
-    cidr: "172.16.2.0/24"
-    role:
-      - controller
-      - compute
-
-  - name: external
-    ip_ranges:
-    - - "192.168.106.210"
-      - "192.168.106.220"
-    cidr: "192.168.106.0/24"
-    gw: "192.168.106.1"
-    role:
-      - controller
-      - compute
-
-internal_vip:
-  ip: 172.16.1.222
-  netmask: "24"
-  interface: mgmt
-
-public_vip:
-  ip: 192.168.106.222
-  netmask: "24"
-  interface: external
-
-onos_nic: eth2
-public_net_info:
-  enable: True
-  network: ext-net
-  type: flat
-  segment_id: 1000
-  subnet: ext-subnet
-  provider_network: physnet
-  router: router-ext
-  enable_dhcp: False
-  no_gateway: False
-  external_gw: "192.168.106.1"
-  floating_ip_cidr: "192.168.106.0/24"
-  floating_ip_start: "192.168.106.101"
-  floating_ip_end: "192.168.106.199"
diff --git a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network_ocl.yml b/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network_ocl.yml
deleted file mode 100644
index 743317c5..00000000
--- a/deploy/conf/vm_environment/huawei-us-deploy-vm-2/network_ocl.yml
+++ /dev/null
@@ -1,90 +0,0 @@
-nic_mappings: []
-bond_mappings: []
-
-provider_net_mappings:
-  - name: br-prv
-    network: physnet
-    interface: eth1
-    type: ovs
-    role:
-      - controller
-      - compute
-
-sys_intf_mappings:
-  - name: mgmt
-    interface: eth1
-    vlan_tag: 101
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    interface: eth1
-    vlan_tag: 102
-    type: vlan
-    role:
-      - controller
-      - compute
-
-  - name: external
-    interface: br-prv
-    type: ovs
-    role:
-      - controller
-      - compute
-
-ip_settings:
-  - name: mgmt
-    ip_ranges:
-    - - "172.16.1.1"
-      - "172.16.1.254"
-    cidr: "172.16.1.0/24"
-    role:
-      - controller
-      - compute
-
-  - name: storage
-    ip_ranges:
-    - - "172.16.2.1"
-      - "172.16.2.254"
-    cidr: "172.16.2.0/24"
-    role:
-      - controller
-      - compute
-
-  - name: external
-    ip_ranges:
-    - - "192.168.106.210"
-      - "192.168.106.220"
-    cidr: "192.168.106.0/24"
-    gw: "192.168.106.1"
-    role:
-      - controller
-      - compute
-
-internal_vip:
-  ip: 172.16.1.222
-  netmask: "24"
-  interface: mgmt
-
-public_vip:
-  ip: 192.168.106.222
-  netmask: "24"
-  interface: external
-
-onos_nic: eth2
-public_net_info:
-  enable: True
-  network: ext-net
-  type: flat
-  segment_id: 1000
-  subnet: ext-subnet
-  provider_network: physnet
-  router: router-ext
-  enable_dhcp: False
-  no_gateway: False
-  external_gw: "100.100.100.1"
-  floating_ip_cidr: "100.100.100.0/24"
-  floating_ip_start: "100.100.100.30"
-  floating_ip_end: "100.100.100.120"