diff --git a/doc/source/heat.rst b/doc/source/heat.rst
index 19570485..e3828df8 100644
--- a/doc/source/heat.rst
+++ b/doc/source/heat.rst
@@ -47,3 +47,12 @@ Heat Orchestration Template (HOT) example
 properties:
 bgpvpn_id: { get_resource: BGPVPN1 }
 network_id: { get_resource: Net1 }
+
+ Router1:
+ type: OS::Neutron::Router
+
+ BGPVPN_ROUTER_assoc1:
+ type: OS::Neutron::BGPVPN-ROUTER-ASSOCIATION
+ properties:
+ bgpvpn_id: { get_resource: BGPVPN1 }
+ router_id: { get_resource: Router1 }
diff --git a/networking_bgpvpn_heat/bgpvpnservice.py b/networking_bgpvpn_heat/bgpvpnservice.py
index 00b96589..7316c537 100644
--- a/networking_bgpvpn_heat/bgpvpnservice.py
+++ b/networking_bgpvpn_heat/bgpvpnservice.py
@@ -204,8 +204,88 @@ class BGPVPNNetAssoc(neutron.NeutronResource):
 self.resource_id, self.properties['bgpvpn_id'])
 
 
+class BGPVPNRouterAssoc(neutron.NeutronResource):
+
+ """A resource for BGPVPNRouterAssoc in neutron.
+
+ """
+
+ PROPERTIES = (
+ BGPVPN_ID, ROUTER_ID
+ ) = (
+ 'bgpvpn_id', 'router_id'
+ )
+
+ ATTRIBUTES = (
+ SHOW, STATUS
+ ) = (
+ 'show', 'status'
+ )
+
+ properties_schema = {
+ BGPVPN_ID: properties.Schema(
+ properties.Schema.STRING,
+ _('ID for the bgpvpn.'),
+ required=True,
+ ),
+ ROUTER_ID: properties.Schema(
+ properties.Schema.STRING,
+ _('Router which shall be associated with the BGPVPN.'),
+ required=True,
+ )
+ }
+
+ attributes_schema = {
+ STATUS: attributes.Schema(
+ _('Status of bgpvpn.'),
+ ),
+ SHOW: attributes.Schema(
+ _('All attributes.')
+ ),
+ }
+
+ def validate(self):
+ super(BGPVPNRouterAssoc, self).validate()
+
+ def handle_create(self):
+ self.props = self.prepare_properties(self.properties,
+ self.physical_resource_name())
+
+ body = self.props.copy()
+ body.pop('bgpvpn_id')
+
+ router_assoc = self.neutron().create_router_association(
+ self.props['bgpvpn_id'],
+ {'router_association': body})
+ self.resource_id_set(router_assoc['router_association']['id'])
+
+ def handle_update(self, json_snippet, tmpl_diff, prop_diff):
+ raise NotImplemented()
+
+ def handle_delete(self):
+ try:
+ self.neutron().delete_router_association(
+ self.resource_id, self.properties['bgpvpn_id'])
+ except Exception as ex:
+ self.client_plugin().ignore_not_found(ex)
+ else:
+ return True
+
+ def _confirm_delete(self):
+ while True:
+ try:
+ self._show_resource()
+ except exception.NotFound:
+ return
+
+ def _show_resource(self):
+ return self.neutron().show_router_association(
+ self.resource_id, self.properties['bgpvpn_id'])
+
+
 def resource_mapping():
 return {
 'OS::Neutron::BGPVPN': BGPVPN,
 'OS::Neutron::BGPVPN-NET-ASSOCIATION': BGPVPNNetAssoc,
+ 'OS::Neutron::BGPVPN-ROUTER-ASSOCIATION': BGPVPNRouterAssoc,
 }
</div><div class="naked_ctrl">
<form action="/index.cgi/larger-text" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/networking-bgpvpn/commit/3c3ccb05fc8aff8e2a9658ff19af7a67f62aadb9.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/networking-bgpvpn/commit/3c3ccb05fc8aff8e2a9658ff19af7a67f62aadb9.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text" selected="selected">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>