[3.0.2.0-42~kilo]Heatv1 : Creation of ECMP-SVC and update of the max instances is failing

[Ganesha HV]

1]. The FQDN of the virtual_network is being formed even if the ID was passed
2]. Update of the AAP on the interface is not being handled:

diff --git a/contrail_heat/resources/service_instance.py b/contrail_heat/resources/service_instance.py
index 0917829..7cc52e8 100644
--- a/contrail_heat/resources/service_instance.py
+++ b/contrail_heat/resources/service_instance.py
@@ -253,7 +253,8 @@ class HeatServiceInstance(ContrailResource):
         if_index = 0
         si_prop = vnc_api.ServiceInstanceType()
         for intf in self.properties[self.INTERFACE_LIST]:
- virt_net = project_obj.get_fq_name_str() + ':' + intf[self.VIRTUAL_NETWORK]
+ # virt_net = project_obj.get_fq_name_str() + ':' + intf[self.VIRTUAL_NETWORK]
+ virt_net = intf[self.VIRTUAL_NETWORK]
             if virt_net == "auto":
                 vn_name = ""
             elif not ":" in virt_net:
@@ -319,7 +320,13 @@ class HeatServiceInstance(ContrailResource):
         si_prop.set_scale_out(scale_out)

         # allowed address pairs
- aaps = self._set_allowed_address_pairs(intf)
+ aapsprop = prop_diff.get(self.INTERFACE_LIST)
+ if aapsprop:
+ for intf in aapsprop:
+ aaps = self._set_allowed_address_pairs(intf)
+ if_type = vnc_api.ServiceInstanceInterfaceType(
+ allowed_address_pairs=aaps)
+ si_prop.add_interface_list(if_type)

         si_obj.set_service_instance_properties(si_prop)
         self.vnc_lib().service_instance_update(si_obj)

3]. Ordered interfaces need to be passed as a Bool :

diff --git a/contrail_heat/resources/service_template.py b/contrail_heat/resources/service_template.py
index 10f5773..b5ef16b 100644
--- a/contrail_heat/resources/service_template.py
+++ b/contrail_heat/resources/service_template.py
@@ -189,8 +189,10 @@ class HeatServiceTemplate(ContrailResource):
         svc_properties.set_availability_zone_enable(self.properties[self.AVAILABILITY_ZONE_ENABLE])
         svc_properties.set_service_virtualization_type(
             self.properties[self.SERVICE_VIRT_TYPE])
- svc_properties.set_ordered_interfaces(
- self.properties[self.ORDERED_INTERFACES])
+ if self.properties[self.ORDERED_INTERFACES] == 'True':
+ svc_properties.set_ordered_interfaces(True)
+ else:
+ svc_properties.set_ordered_interfaces(False)
         svc_properties.set_version(int(self.properties[self.SERVICE_VERSION]))
         # set interface list
         itf_list = self.properties[self.SERVICE_INTERFACE_TYPE_LIST]
[ganeshahv@nodeb10 contrail-heat]$

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/20701
Submitter: Ganesha HV (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/20702
Submitter: Ganesha HV (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/20702
Committed: http://github.org/Juniper/contrail-heat/commit/8ab78b8f7bd74f190287640596ff66d85a527486
Submitter: Zuul
Branch: R3.0

commit 8ab78b8f7bd74f190287640596ff66d85a527486
Author: Ganesha H V <email address hidden>
Date: Fri May 27 14:43:46 2016 +0530

Handling updation cases

1]. The FQDN of the virtual_network is being formed even if the ID was passed
2]. Update of the AAP on the interface
3]. Ordered interfaces need to be passed as a Bool

Partial-Bug: #1586325
Change-Id: Ia2149137f8ee0d5fce1e1c431223daaef15e6a17

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/20701
Committed: http://github.org/Juniper/contrail-heat/commit/d2e3791f0453a5f3669953c56ec6161e036349c3
Submitter: Zuul
Branch: master

commit d2e3791f0453a5f3669953c56ec6161e036349c3
Author: Ganesha H V <email address hidden>
Date: Fri May 27 14:43:46 2016 +0530

Handling updation cases

1]. The FQDN of the virtual_network is being formed even if the ID was passed
2]. Update of the AAP on the interface
3]. Ordered interfaces need to be passed as a Bool

Partial-Bug: #1586325
Change-Id: Ia2149137f8ee0d5fce1e1c431223daaef15e6a17