Merge pull request #46 from oracle-devrel/develop

Automation Toolkit v10.2

Author: dipeshrath

cd3_automation_toolkit/Network/BaseNetwork/modify_routerules_tf.py

@@ -462,19 +462,19 @@ def generate_route_table_string(region_rt_name,region,routetableStr,tempStr,comm
                             obj_tf_name = commonTools.check_tf_variable(obj_tf_name)
                         else:
                             obj_tf_name = dest_objs[1].strip()
-                    if ('ngw' in dest_objs[0].lower().strip()):
+                    if (dest_objs[0].lower().strip().startswith('ngw')):
                         tempdict = {'resource' : 'NGW','network_entity_id': obj_tf_name }
                         tempStr.update(tempdict)
-                    elif ('sgw' in dest_objs[0].lower().strip()):
+                    elif (dest_objs[0].lower().strip().startswith('sgw')):
                         tempdict = {'resource': 'SGW','network_entity_id': obj_tf_name}
                         tempStr.update(tempdict)
-                    elif ('igw' in dest_objs[0].lower().strip()):
+                    elif (dest_objs[0].lower().strip().startswith('igw')):
                         tempdict = {'resource': 'IGW','network_entity_id': obj_tf_name}
                         tempStr.update(tempdict)
-                    elif ('lpg' in dest_objs[0].lower().strip()):
+                    elif (dest_objs[0].lower().strip().startswith('lpg')):
                         tempdict = {'resource': 'LPG','network_entity_id': obj_tf_name}
                         tempStr.update(tempdict)
-                    elif ('drg' in dest_objs[0].lower().strip()):
+                    elif (dest_objs[0].lower().strip().startswith('drg')):
                         # dest_obj = "${oci_core_drg." + vcn_tf_name+"_"+obj_tf_name + ".id}"
                         dest_obj = commonTools.check_tf_variable(dest_objs[1].strip())
                         tempdict = {'resource': 'DRG','network_entity_id': dest_obj}