Merge "Move api_samples to doc dir"

nova/tests/integrated/test_api_samples.py

@@ -85,8 +85,8 @@ def to_dict(node):
             return to_dict(etree.fromstring(data))
 
     @classmethod
-    def _get_sample(cls, name, suffix=''):
-        parts = [os.path.dirname(os.path.abspath(__file__))]
+    def _get_sample_path(cls, name, dirname, suffix=''):
+        parts = [dirname]
         parts.append('api_samples')
         if cls.all_extensions:
             parts.append('all_extensions')
@@ -96,8 +96,19 @@ def _get_sample(cls, name, suffix=''):
         parts.append(name + "." + cls.ctype + suffix)
         return os.path.join(*parts)
 
+    @classmethod
+    def _get_sample(cls, name):
+        dirname = os.path.dirname(os.path.abspath(__file__))
+        dirname = os.path.join(dirname, "../../../doc")
+        return cls._get_sample_path(name, dirname)
+
+    @classmethod
+    def _get_template(cls, name):
+        dirname = os.path.dirname(os.path.abspath(__file__))
+        return cls._get_sample_path(name, dirname, suffix='.tpl')
+
     def _read_template(self, name):
-        template = self._get_sample(name, suffix='.tpl')
+        template = self._get_template(name)
         if self.generate_samples and not os.path.exists(template):
             with open(template, 'w') as outf:
                 pass