update opera fix

opera codes has been updated and network_openo.yml is modified
according to new opera net config. open-o related keys in
deploy/compass_conf/package_metadata/openstack.conf should be
modified as well

Change-Id: I55f8ed3dedcbfd30a3f01b70c958258199f600e6
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
(cherry picked from commit b7fb5c062e0e806e34ebc53fe670f00f8417cd4a)

diff --git a/deploy/compass_conf/package_metadata/openstack.conf b/deploy/compass_conf/package_metadata/openstack.conf
index 555f007..b07efd4 100755 (executable)
--- a/deploy/compass_conf/package_metadata/openstack.conf
+++ b/deploy/compass_conf/package_metadata/openstack.conf
@@ -250,79 +250,29 @@ METADATA = {
             'is_required': False
         },
 
-        'openo_vm_ip': {
+        'openo_ip': {
             '_self': {
-            'mapping_to': 'openo_vm_ip',
+            'mapping_to': 'openo_ip',
             'is_required': False,
             'field': 'general',
             }
         },
-        'openo_vm_mask': {
+        'openo_docker_gw': {
             '_self': {
-            'mapping_to': 'openo_vm_mask',
+            'mapping_to': 'openo_docker_gw',
             'is_required': False,
             'field': 'general',
             }
         },
-        'openo_external_gw': {
+        'openo_docker_cidr': {
             '_self': {
-            'mapping_to': 'openo_external_gw',
-            'is_required': False,
-            'field': 'general',
-            }
-        },
-        'openo_external_cidr': {
-            '_self': {
-            'mapping_to': 'openo_external_cidr',
-            'is_required': False,
-            'field': 'general',
-            }
-        }
-    },
-
-    'openo_docker_net': {
-        '_self': {
-            'mapping_to': 'openo_docker_net',
-            'is_required': False
-        },
-
-        'docker_ip_start': {
-            '_self': {
-            'mapping_to': 'docker_ip_start',
-            'is_required': False,
-            'field': 'general',
-            }
-        },
-        'docker_ip_end': {
-            '_self': {
-            'mapping_to': 'docker_ip_end',
+            'mapping_to': 'openo_docker_cidr',
             'is_required': False,
             'field': 'general',
             }
         }
     },
 
-    'juju_net': {
-        '_self': {
-            'mapping_to': 'juju_net',
-            'is_required': False
-        },
-
-        'juju_net_cidr': {
-            '_self': {
-            'mapping_to': 'juju_net_cidr',
-            'is_required': False,
-            'field': 'general',
-            }
-        },
-        'juju_net_gw': {
-            '_self': {
-            'mapping_to': 'juju_net_gw',
-            'is_required': False,
-            'field': 'general',
-            }
-        }
-    },
 
     'public_net_info': {
         '_self': {