X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=deploy%2Ftemplater.py;h=bda60c7febcec12939f3151c1986919abc619592;hb=00bf737316a29867a1fcc38753418d6e2fff9f27;hp=2ad6e05bac3e8ecd54287630aaf1e8af34ac75e1;hpb=65980945183bc2fa90d7a8957707ca598d327101;p=fuel.git

diff --git a/deploy/templater.py b/deploy/templater.py
index 2ad6e05ba..bda60c7fe 100755
--- a/deploy/templater.py
+++ b/deploy/templater.py
@@ -12,6 +12,7 @@
 import io
 import re
 import yaml
+import urllib2
 from common import(
     err,
     ArgParser,
@@ -29,10 +30,29 @@ class Templater(object):
         self.output_file = output_file
         self.base = self.load_yaml(base_file)
 
-    def load_yaml(self, filename):
+    def is_url(self, filespec):
+        regex = re.compile('^([^/:]+)://')
+        return re.search(regex, filespec)
+
+    def load_template(self, filespec):
+        try:
+            if(self.is_url(filespec)):
+                response = urllib2.urlopen(filespec)
+                return response.read()
+            else:
+                with io.open(filespec) as f:
+                    return f.readlines()
+        except Exception as error:
+            err('Error opening template file: %s' % error)
+
+    def load_yaml(self, filespec):
         try:
-            with io.open(filename) as yaml_file:
-                return yaml.load(yaml_file)
+            if(self.is_url(filespec)):
+                response = urllib2.urlopen(filespec)
+                return yaml.load(response)
+            else:
+                with io.open(filespec) as f:
+                    return yaml.load(f)
         except Exception as error:
             err('Error opening YAML file: %s' % error)
 
@@ -107,12 +127,28 @@ class Templater(object):
 
         return self.get_interface_from_network(interfaces, args[0])
 
+    def parse_include_tag(self, tag):
+        # Remove 'include(' prefix and trailing ')'
+        filename = tag[len('include('):].rstrip(')')
+
+        if not filename:
+            err('No argument for include().')
+
+        return filename
+
+    def include_file(self, filename):
+        fragment = self.load_yaml(filename)
+        return yaml.dump(fragment, default_flow_style=False)
+
     def parse_tag(self, tag, indent):
         fragment = ''
 
         if 'interface(' in tag:
             args = self.parse_interface_tag(tag)
             fragment = self.lookup_interface(args)
+        elif 'include(' in tag:
+            filename = self.parse_include_tag(tag)
+            fragment = self.include_file(filename)
         else:
             path = tag.split(DELIMITER)
             fragment = self.base
@@ -131,12 +167,11 @@ class Templater(object):
 
         regex = re.compile(re.escape(TAG_START) + r'([a-z].+)' + re.escape(TAG_END),
                            flags=re.IGNORECASE)
-        with io.open(self.template_file) as f:
-            for line in f:
-                indent = self.get_indent(line)
-                result += re.sub(regex,
-                                 lambda match: self.parse_tag(match.group(1), indent),
-                                 line)
+        for line in self.load_template(self.template_file):
+            indent = self.get_indent(line)
+            result += re.sub(regex,
+                             lambda match: self.parse_tag(match.group(1), indent),
+                             line)
 
         self.save_yaml(self.output_file, result)
 
@@ -148,9 +183,9 @@ template variable substitution and write the results to 'output_file'.'''
     parser = ArgParser(prog='python %s' % __file__,
                        description=description)
     parser.add_argument('base_file',
-                        help='Base YAML filename')
+                        help='Base YAML file or URL')
     parser.add_argument('template_file',
-                        help='Fragment filename')
+                        help='Template file or URL')
     parser.add_argument('output_file',
                         help='Output filename')