X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=examples%2Fping_pong_ns%2Frift%2Fmano%2Fexamples%2Fping_pong_nsd.py;h=0941129c388e23addbd13925d062fc0e568ab734;hb=refs%2Fchanges%2F42%2F1742%2F1;hp=e0a68489fa0b2b950617b37a04843184774a4feb;hpb=c2fe40c38153248d1a9f436241c65d5f43e5a900;p=osm%2FSO.git

diff --git a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
index e0a68489..0941129c 100755
--- a/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
+++ b/examples/ping_pong_ns/rift/mano/examples/ping_pong_nsd.py
@@ -306,14 +306,9 @@ class VirtualNetworkFunction(ManoDescriptor):
         vnfd = self.descriptor.vnfd[0]
         # Add vnf configuration
         vnf_config = vnfd.vnf_configuration
-
-        # vnf_config.config_attributes.config_delay = 10
-
-        # Select "script" configuration
-        vnf_config.script.script_type = 'bash'
+        vnf_config.script.script_type = 'python'
 
         # Add initial config primitive
-        vnf_config.create_initial_config_primitive()
         init_config = VnfdYang.InitialConfigPrimitive.from_dict(
               {
                   "seq": 1,
@@ -327,12 +322,9 @@ class VirtualNetworkFunction(ManoDescriptor):
         vnfd = self.descriptor.vnfd[0]
         # Add vnf configuration
         vnf_config = vnfd.vnf_configuration
-
-        # Select "script" configuration
-        vnf_config.script.script_type = 'bash'
+        vnf_config.script.script_type = 'python'
 
         # Add initial config primitive
-        vnf_config.create_initial_config_primitive()
         init_config = VnfdYang.InitialConfigPrimitive.from_dict(
               {
                   "seq": 1,
@@ -420,15 +412,24 @@ class NetworkService(ManoDescriptor):
         self.vnfd_config = {}
         self._placement_groups = []
 
-    def default_config(self, vnfd):
+    def default_config(self, constituent_vnfd, vnfd, mano_ut, use_ns_init_conf, use_vnf_init_conf):
         vnf_config = vnfd.vnfd.vnf_configuration
 
         vnf_config.config_attributes.config_priority = 0
         vnf_config.config_attributes.config_delay = 0
 
-        # Select "script" configuration
-        vnf_config.script.script_type = 'bash'
-        vnf_config.config_template = "#!/bin/bash"
+        if vnfd.name == 'pong_vnfd' or vnfd.name == 'pong_vnfd_with_epa' or vnfd.name == 'pong_vnfd_aws':
+            vnf_config.config_attributes.config_priority = 1
+            # First priority config delay will delay the entire NS config delay
+            if mano_ut is False:
+                vnf_config.config_attributes.config_delay = 60
+            else:
+                # This is PONG and inside mano_ut
+                # This is test only
+                vnf_config.config_attributes.config_delay = 10
+
+        if vnfd.name == 'ping_vnfd' or vnfd.name == 'ping_vnfd_with_epa' or vnfd.name == 'ping_vnfd_aws':
+            vnf_config.config_attributes.config_priority = 2
 
 
     def ns_config(self, nsd, vnfd_list, mano_ut):
@@ -558,7 +559,8 @@ class NetworkService(ManoDescriptor):
                     constituent_vnfd.start_by_default = False
 
                 constituent_vnfd.vnfd_id_ref = vnfd.descriptor.vnfd[0].id
-                self.default_config(vnfd)
+                self.default_config(constituent_vnfd, vnfd, mano_ut,
+                        -                                    use_ns_init_conf, use_vnf_init_conf)
                 member_vnf_index += 1
 
         # Enable config primitives if either mano_ut or